diff --git a/couchpotato/core/media/show/library/episode/main.py b/couchpotato/core/media/show/library/episode/main.py
index e24338e..09cacd9 100644
--- a/couchpotato/core/media/show/library/episode/main.py
+++ b/couchpotato/core/media/show/library/episode/main.py
@@ -39,8 +39,8 @@ class EpisodeLibraryPlugin(LibraryBase):
             identifier['episode'] = scene_map.get('episode')
         else:
             # Fallback to normal season/episode numbers
-            identifier['season'] = library.get('season')
-            identifier['episode'] = library.get('episode')
+            identifier['season'] = library.get('season_number')
+            identifier['episode'] = library.get('episode_number')
 
 
         # Cast identifiers to integers
diff --git a/couchpotato/core/plugins/matcher/main.py b/couchpotato/core/plugins/matcher/main.py
index 0baba03..777f91a 100644
--- a/couchpotato/core/plugins/matcher/main.py
+++ b/couchpotato/core/plugins/matcher/main.py
@@ -33,7 +33,7 @@ class Matcher(Plugin):
             if fireEvent('searcher.correct_match', chain, release, media, quality, single = True):
                 return chain
 
-        return None
+        return False
 
     def chainMatch(self, chain, group, tags):
         found_tags = []