diff --git a/deluge/component.py b/deluge/component.py
index 6fe62920f..55d8ad814 100644
--- a/deluge/component.py
+++ b/deluge/component.py
@@ -172,7 +172,8 @@ class ComponentRegistry:
             try:
                 self.components[component].shutdown()
             except Exception, e:
-                log.debug("Unable to call shutdown(): %s", e)
+                log.debug("Unable to call shutdown()")
+                log.exception(e)
 
 
 _ComponentRegistry = ComponentRegistry()
diff --git a/deluge/core/pluginmanager.py b/deluge/core/pluginmanager.py
index 5d1648022..8761381dd 100644
--- a/deluge/core/pluginmanager.py
+++ b/deluge/core/pluginmanager.py
@@ -65,7 +65,8 @@ class PluginManager(deluge.pluginmanagerbase.PluginManagerBase,
         # Disable all enabled plugins
         self.disable_plugins()
         # Stop the update timer
-        self.update_timer.stop()
+        if self.update_timer.running:
+            self.update_timer.stop()
 
     def shutdown(self):
         self.stop()