diff --git a/lib/redmine/themes.rb b/lib/redmine/themes.rb
index 2b38ec517..77833cb35 100644
--- a/lib/redmine/themes.rb
+++ b/lib/redmine/themes.rb
@@ -30,6 +30,8 @@ module Redmine
     
     # Return theme for given id, or nil if it's not found
     def self.theme(id, options={})
+      return nil if id.blank?
+      
       found = themes.find {|t| t.id == id}
       if found.nil? && options[:rescan] != false
         rescan