diff --git a/settings.py b/settings.py
index 0875626ac10617845f374cd32bfb519be7f33592..20d2330644add7a4cedf0cdb11c293efe3bf517e 100644
--- a/settings.py
+++ b/settings.py
@@ -19,7 +19,11 @@ DEBUG = (get_from_env('DEBUG', '1') == '1')
 # add admins of the form: 
 #    ('Ben Adida', 'ben@adida.net'),
 # if you want to be emailed about errors.
-ADMINS = (get_from_env('ADMIN_NAME', ''), get_from_env('ADMIN_EMAIL', ''))
+admin_email = get_from_env('ADMIN_EMAIL', None)
+if admin_email:
+    ADMINS = [(get_from_env('ADMIN_NAME', ''), admin_email)]
+else:
+    ADMINS = []
 
 MANAGERS = ADMINS