diff --git a/src/NzbDrone.Core/Download/Aggregation/RemoteMovieAggregationService.cs b/src/NzbDrone.Core/Download/Aggregation/RemoteMovieAggregationService.cs
index 46d635d6e3..8ccd6e939c 100644
--- a/src/NzbDrone.Core/Download/Aggregation/RemoteMovieAggregationService.cs
+++ b/src/NzbDrone.Core/Download/Aggregation/RemoteMovieAggregationService.cs
@@ -25,6 +25,11 @@ public RemoteMovieAggregationService(IEnumerable<IAggregateRemoteMovie> augmente
 
         public RemoteMovie Augment(RemoteMovie remoteMovie)
         {
+            if (remoteMovie == null)
+            {
+                return null;
+            }
+
             foreach (var augmenter in _augmenters)
             {
                 try
diff --git a/src/NzbDrone.Core/Movies/MovieScannedHandler.cs b/src/NzbDrone.Core/Movies/MovieScannedHandler.cs
index 63fe3c7f6d..645e819e1c 100644
--- a/src/NzbDrone.Core/Movies/MovieScannedHandler.cs
+++ b/src/NzbDrone.Core/Movies/MovieScannedHandler.cs
@@ -30,19 +30,21 @@ public MovieScannedHandler(IMovieService movieService,
 
         private void HandleScanEvents(Movie movie)
         {
-            if (movie.AddOptions == null)
+            var addOptions = movie.AddOptions;
+
+            if (addOptions == null)
             {
                 return;
             }
 
             _logger.Info("[{0}] was recently added, performing post-add actions", movie.Title);
 
-            if (movie.AddOptions.SearchForMovie)
+            if (addOptions.SearchForMovie)
             {
                 _commandQueueManager.Push(new MoviesSearchCommand { MovieIds = new List<int> { movie.Id } });
             }
 
-            if (movie.AddOptions.Monitor == MonitorTypes.MovieAndCollection && movie.MovieMetadata.Value.CollectionTmdbId > 0)
+            if (addOptions.Monitor == MonitorTypes.MovieAndCollection && movie.MovieMetadata.Value.CollectionTmdbId > 0)
             {
                 var collection = _collectionService.FindByTmdbId(movie.MovieMetadata.Value.CollectionTmdbId);
                 collection.Monitored = true;