diff --git a/Contents/Code/__init__.py b/Contents/Code/__init__.py
index f82327ab..2df04386 100755
--- a/Contents/Code/__init__.py
+++ b/Contents/Code/__init__.py
@@ -67,6 +67,9 @@ def scanTvMedia(media):
                 for part in item.parts:
                     scanned_video = scanVideo(part, ignore_all=force_refresh,
                                               hints={"type": "episode", "expected_series": [media.title], "expected_title": [ep.title]})
+                    if not scanned_video:
+                        continue
+                        
                     scanned_video.id = media.seasons[season].episodes[episode].id
                     videos[scanned_video] = part
     return videos
@@ -78,6 +81,9 @@ def scanMovieMedia(media):
     for item in media.items:
         for part in item.parts:
             scanned_video = scanVideo(part, ignore_all=force_refresh, hints={"type": "movie", "expected_title": [media.title]})
+            if not scanned_video:
+                continue
+
             scanned_video.id = media.id
             videos[scanned_video] = part
     return videos
diff --git a/Contents/Code/support/subtitlehelpers.py b/Contents/Code/support/subtitlehelpers.py
index 214b234a..debdc672 100644
--- a/Contents/Code/support/subtitlehelpers.py
+++ b/Contents/Code/support/subtitlehelpers.py
@@ -145,7 +145,7 @@ def getSubtitlesFromMetadata(part):
             except ValueError:
                 Log.Error("Couldn't parse subtitle info, got proxy %s" % proxy)
                 continue
-                
+
             if p_type == "Media":
                 # metadata subtitle
                 subs[language].append(key)