diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d7d05ee8..314eab847 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@ at anytime.
   *
 
 ### Fixed
-  *
+  * Fixed uncaught error when shutting down after a failed daemon startup
   *
 
 ### Deprecated
diff --git a/lbrynet/daemon/Daemon.py b/lbrynet/daemon/Daemon.py
index d0ad6e43f..542b287fb 100644
--- a/lbrynet/daemon/Daemon.py
+++ b/lbrynet/daemon/Daemon.py
@@ -488,7 +488,8 @@ class Daemon(AuthJSONRPCServer):
             old_revision = int(open(self.db_revision_file).read().strip())
 
         if old_revision > self.current_db_revision:
-            raise Exception('This version of lbrynet is not compatible with the database')
+            raise Exception('This version of lbrynet is not compatible with the database\n'
+                            'Your database is revision %i, expected %i' % (old_revision, self.current_db_revision))
 
         def update_version_file_and_print_success():
             self._write_db_revision_file(self.current_db_revision)
diff --git a/lbrynet/daemon/DaemonControl.py b/lbrynet/daemon/DaemonControl.py
index c5abca464..db60ce01c 100644
--- a/lbrynet/daemon/DaemonControl.py
+++ b/lbrynet/daemon/DaemonControl.py
@@ -97,7 +97,7 @@ def start_server_and_listen(use_auth, analytics_manager):
         yield daemon_server.start(use_auth)
         analytics_manager.send_server_startup_success()
     except Exception as e:
-        log.exception('Failed to start')
+        log.exception('Failed to start lbrynet-daemon')
         analytics_manager.send_server_startup_error(str(e))
         daemon_server.stop()
 
diff --git a/lbrynet/daemon/DaemonServer.py b/lbrynet/daemon/DaemonServer.py
index 578c3b0a6..d506c1245 100644
--- a/lbrynet/daemon/DaemonServer.py
+++ b/lbrynet/daemon/DaemonServer.py
@@ -52,7 +52,6 @@ class DaemonServer(object):
         yield self._setup_server(use_auth)
         yield self._daemon.setup()
 
-    @defer.inlineCallbacks
     def stop(self):
         if reactor.running:
             log.info("Stopping the reactor")