diff --git a/nova/rpc.py b/nova/rpc.py
index bdf2f74b3..49b11602b 100644
--- a/nova/rpc.py
+++ b/nova/rpc.py
@@ -192,6 +192,7 @@ class AdapterConsumer(TopicConsumer):
             if msg_id:
                 msg_reply(msg_id, rval, None)
         except Exception as e:
+            logging.exception("Exception during message handling")
             if msg_id:
                 msg_reply(msg_id, None, sys.exc_info())
         return
diff --git a/nova/service.py b/nova/service.py
index 05503b52b..864a42469 100644
--- a/nova/service.py
+++ b/nova/service.py
@@ -211,9 +211,10 @@ class Service(object):
                 try:
                     models.register_models()
                 except OperationalError:
-                    logging.exception(_("Data store is unreachable."
-                        " Trying again in %d seconds.") %
-                            FLAGS.sql_retry_interval)
+                    logging.exception(_("Data store %s is unreachable."
+                                        " Trying again in %d seconds.") %
+                                      (FLAGS.sql_connection,
+                                       FLAGS.sql_retry_interval))
                     time.sleep(FLAGS.sql_retry_interval)