Merge branch 'master' into debug-sql-shell

1 files changed, 7 insertions, 1 deletions

diff --git a/debug_toolbar/panels/signals.py b/debug_toolbar/panels/signals.py
index 0a75282..7fe382e 100644
--- a/debug_toolbar/panels/signals.py
+++ b/debug_toolbar/panels/signals.py
@@ -3,12 +3,16 @@ import sys
 from django.conf import settings
 from django.core.signals import request_started, request_finished, \
     got_request_exception
-from django.db.backends.signals import connection_created
 from django.db.models.signals import class_prepared, pre_init, post_init, \
     pre_save, post_save, pre_delete, post_delete, post_syncdb
 from django.dispatch.dispatcher import WEAKREF_TYPES
 from django.template.loader import render_to_string
 
+try:
+    from django.db.backends.signals import connection_created
+except ImportError:
+    connection_created = None
+
 from debug_toolbar.panels import DebugPanel
 
 class SignalDebugPanel(DebugPanel):
@@ -56,6 +60,8 @@ class SignalDebugPanel(DebugPanel):
         keys.sort()
         for name in keys:
             signal = self.signals[name]
+            if signal is None:
+                continue
             receivers = []
             for (receiverkey, r_senderkey), receiver in signal.receivers:
                 if isinstance(receiver, WEAKREF_TYPES):