diff --git a/app/__init__.py b/app/__init__.py
index 871a5589e..fe5ea530e 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -2,7 +2,7 @@ import os
 import re
 
 import dateutil
-from flask import (Flask, session, Markup, escape, render_template, make_response)
+from flask import (Flask, session, Markup, escape, render_template, make_response, current_app)
 from flask._compat import string_types
 from flask_login import LoginManager
 from flask_wtf import CsrfProtect
@@ -206,4 +206,6 @@ def register_errorhandlers(application):
 
     @application.errorhandler(Exception)
     def handle_bad_request(error):
+        if current_app.config.get('DEBUG', None):
+            raise error
         return _error_response(500)
diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index c1f773842..6fc17c49c 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -49,8 +49,10 @@ def expand_statistics(statistics, danger_zone=25):
     today = statistics[0]
 
     today.update({
-        'emails_failure_rate': int(today['emails_error'] / today['emails_requested'] * 100),
-        'sms_failure_rate': int(today['sms_error'] / today['sms_requested'] * 100)
+        'emails_failure_rate':
+            int(today['emails_error'] / today['emails_requested'] * 100) if today['emails_requested'] else 0,
+        'sms_failure_rate':
+            int(today['sms_error'] / today['sms_requested'] * 100) if today['sms_requested'] else 0
     })
 
     today.update({