diff --git a/ckan/config/middleware/__init__.py b/ckan/config/middleware/__init__.py
index ca5c9b2f70c..73af42fa2f4 100644
--- a/ckan/config/middleware/__init__.py
+++ b/ckan/config/middleware/__init__.py
@@ -53,7 +53,6 @@ def make_app(conf, full_stack=True, static_files=True, **app_conf):
     middleware.
     '''
 
-    import pdb; pdb.set_trace()
     load_environment(conf, app_conf)
 
     pylons_app = make_pylons_stack(conf, full_stack, static_files,
diff --git a/ckan/config/middleware/flask_app.py b/ckan/config/middleware/flask_app.py
index 7edb1de929d..7aaf89fb85b 100644
--- a/ckan/config/middleware/flask_app.py
+++ b/ckan/config/middleware/flask_app.py
@@ -107,6 +107,10 @@ def make_flask_stack(conf, **app_conf):
         app.config['DEBUG_TB_INTERCEPT_REDIRECTS'] = False
         DebugToolbarExtension(app)
 
+        from werkzeug.debug import DebuggedApplication
+        app = DebuggedApplication(app, True)
+        app = app.app
+
     # Use Beaker as the Flask session interface
     class BeakerSessionInterface(SessionInterface):
         def open_session(self, app, request):