diff --git a/passbook/core/urls.py b/passbook/core/urls.py
index 61461cb06..7fecdf614 100644
--- a/passbook/core/urls.py
+++ b/passbook/core/urls.py
@@ -17,7 +17,7 @@ admin.site.login = RedirectView.as_view(pattern_name='passbook_core:auth-login')
 handler400 = error.BadRequestView.as_view()
 handler403 = error.ForbiddenView.as_view()
 handler404 = error.NotFoundView.as_view()
-handler500 = error.BadRequestView.as_view()
+handler500 = error.ServerErrorView.as_view()
 
 core_urls = [
     # Authentication views
diff --git a/passbook/core/views/error.py b/passbook/core/views/error.py
index ccfec9833..f2ec1b337 100644
--- a/passbook/core/views/error.py
+++ b/passbook/core/views/error.py
@@ -58,3 +58,8 @@ class ServerErrorView(TemplateView):
     extra_context = {
         'is_login': True
     }
+
+    # pylint: disable=useless-super-delegation
+    def dispatch(self, *args, **kwargs):
+        """Little wrapper so django accepts this function"""
+        return super().dispatch(*args, **kwargs)