lib/mail_engine/engine.rb in mail_engine-0.1.14 vs lib/mail_engine/engine.rb in mail_engine-0.1.15

@@ -42,9 +42,11 @@
 
     config.to_prepare do
       # load config
       MailEngine::Configuration.load_and_check
 
-      MailEngine::USER_MODEL = MailEngine::Base.current_config["user_class_name"].constantize unless defined?(MailEngine::USER_MODEL)
+      if MailEngine::Base.current_config.present? and !defined?(MailEngine::USER_MODEL)
+        MailEngine::USER_MODEL = MailEngine::Base.current_config["user_class_name"].constantize
+      end
     end
   end
 end
\ No newline at end of file