Ensure if we're overriding the urlconf that we're resetting handler404/500

1 files changed, 5 insertions, 1 deletions

diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py
index 2a2f001..446bc38 100644
--- a/debug_toolbar/middleware.py
+++ b/debug_toolbar/middleware.py
@@ -73,10 +73,14 @@ class DebugToolbarMiddleware(object):
     def process_request(self, request):
         if self.show_toolbar(request):
             if self.override_url:
-                original_urlconf = getattr(request, 'urlconf', settings.ROOT_URLCONF)
+                original_urlconf = __import__(getattr(request, 'urlconf', settings.ROOT_URLCONF), {}, {}, ['*'])
                 debug_toolbar.urls.urlpatterns += patterns('',
                     ('', include(original_urlconf)),
                 )
+                if hasattr(original_urlconf, 'handler404'):
+                    debug_toolbar.urls.handler404 = original_urlconf.handler404
+                if hasattr(original_urlconf, 'handler500'):
+                    debug_toolbar.urls.handler500 = original_urlconf.handler500
                 self.override_url = False
             request.urlconf = 'debug_toolbar.urls'