diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 36947d9b3f89ded9c0af6b76341b6d45fbeb5b1c..76f84799ecc0c16e93041d381411d52861b014bd 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -6,7 +6,15 @@
 # four configuration values can also be set straight in your models.
 Devise.setup do |config|
   # Configure the e-mail address which will be shown in DeviseMailer.
-  config.mailer_sender = APP_CONFIG[:smtp_sender_address]
+  if APP_CONFIG[:smtp_sender_address]
+    config.mailer_sender = APP_CONFIG[:smtp_sender_address]
+  else
+    unless Rails.env == 'test'
+      Rails.logger.warn("No smtp sender address set, mail may fail.")
+      puts "WARNING: No smtp sender address set, mail may fail." 
+    end
+    config.mailer_sender = "please-change-me@config-initializers-devise.com" 
+  end
 
   # ==> ORM configuration
   # Load and configure the ORM. Supports :active_record (default), :mongoid