diff --git a/couchpotato/core/plugins/manage/main.py b/couchpotato/core/plugins/manage/main.py
index d4bae232..52b42271 100644
--- a/couchpotato/core/plugins/manage/main.py
+++ b/couchpotato/core/plugins/manage/main.py
@@ -56,7 +56,8 @@ class Manage(Plugin):
 
             log.info('Updating manage library: %s' % directory)
             identifiers = fireEvent('scanner.folder', folder = directory, newer_than = last_update, single = True)
-            added_identifiers.extend(identifiers)
+            if identifiers:
+                added_identifiers.extend(identifiers)
 
             # Break if CP wants to shut down
             if self.shuttingDown():
diff --git a/couchpotato/core/plugins/scanner/main.py b/couchpotato/core/plugins/scanner/main.py
index 7bc726c0..a36742de 100644
--- a/couchpotato/core/plugins/scanner/main.py
+++ b/couchpotato/core/plugins/scanner/main.py
@@ -129,7 +129,8 @@ class Scanner(Plugin):
                 # Add release
                 fireEvent('release.add', group = group)
                 library_item = fireEvent('library.update', identifier = group['library'].get('identifier'), single = True)
-                added_identifier.append(library_item['identifier'])
+                if library_item:
+                    added_identifier.append(library_item['identifier'])
 
         return added_identifier