diff --git a/couchpotato/core/plugins/library/main.py b/couchpotato/core/plugins/library/main.py
index b463abfd..1842ed70 100644
--- a/couchpotato/core/plugins/library/main.py
+++ b/couchpotato/core/plugins/library/main.py
@@ -10,6 +10,7 @@ import traceback
 
 log = CPLog(__name__)
 
+
 class LibraryPlugin(Plugin):
 
     default_dict = {'titles': {}, 'files':{}}
@@ -57,6 +58,9 @@ class LibraryPlugin(Plugin):
 
     def update(self, identifier, default_title = '', force = False):
 
+        if self.shuttingDown():
+            return
+
         db = get_session()
         library = db.query(Library).filter_by(identifier = identifier).first()
         done_status = fireEvent('status.get', 'done', single = True)
diff --git a/couchpotato/core/plugins/manage/main.py b/couchpotato/core/plugins/manage/main.py
index 25831f94..63584636 100644
--- a/couchpotato/core/plugins/manage/main.py
+++ b/couchpotato/core/plugins/manage/main.py
@@ -192,7 +192,7 @@ class Manage(Plugin):
 
         # Notify frontend
         def afterUpdate():
-            if not self.in_progress:
+            if not self.in_progress or self.shuttingDown():
                 return
 
             self.in_progress[folder]['to_go'] = self.in_progress[folder]['to_go'] - 1