diff --git a/src/NzbDrone.Core/Download/Aggregation/RemoteEpisodeAggregationService.cs b/src/NzbDrone.Core/Download/Aggregation/RemoteEpisodeAggregationService.cs
index a2c2ae081..3ad998745 100644
--- a/src/NzbDrone.Core/Download/Aggregation/RemoteEpisodeAggregationService.cs
+++ b/src/NzbDrone.Core/Download/Aggregation/RemoteEpisodeAggregationService.cs
@@ -25,6 +25,11 @@ namespace NzbDrone.Core.Download.Aggregation
 
         public RemoteEpisode Augment(RemoteEpisode remoteEpisode)
         {
+            if (remoteEpisode == null)
+            {
+                return null;
+            }
+
             foreach (var augmenter in _augmenters)
             {
                 try
diff --git a/src/NzbDrone.Core/Tv/SeriesScannedHandler.cs b/src/NzbDrone.Core/Tv/SeriesScannedHandler.cs
index 60efcc6e5..e4d8ea90a 100644
--- a/src/NzbDrone.Core/Tv/SeriesScannedHandler.cs
+++ b/src/NzbDrone.Core/Tv/SeriesScannedHandler.cs
@@ -58,12 +58,12 @@ namespace NzbDrone.Core.Tv
             }
             else
             {
-                if (series.AddOptions.SearchForMissingEpisodes)
+                if (addOptions.SearchForMissingEpisodes)
                 {
                     _commandQueueManager.Push(new MissingEpisodeSearchCommand(series.Id));
                 }
 
-                if (series.AddOptions.SearchForCutoffUnmetEpisodes)
+                if (addOptions.SearchForCutoffUnmetEpisodes)
                 {
                     _commandQueueManager.Push(new CutoffUnmetEpisodeSearchCommand(series.Id));
                 }