diff --git a/src/NzbDrone.Core/Download/Aggregation/RemoteAlbumAggregationService.cs b/src/NzbDrone.Core/Download/Aggregation/RemoteAlbumAggregationService.cs
index 46352c300..ec73a0285 100644
--- a/src/NzbDrone.Core/Download/Aggregation/RemoteAlbumAggregationService.cs
+++ b/src/NzbDrone.Core/Download/Aggregation/RemoteAlbumAggregationService.cs
@@ -25,6 +25,11 @@ namespace NzbDrone.Core.Download.Aggregation
 
         public RemoteAlbum Augment(RemoteAlbum remoteAlbum)
         {
+            if (remoteAlbum == null)
+            {
+                return null;
+            }
+
             foreach (var augmenter in _augmenters)
             {
                 try
diff --git a/src/NzbDrone.Core/Music/Handlers/ArtistScannedHandler.cs b/src/NzbDrone.Core/Music/Handlers/ArtistScannedHandler.cs
index 97221d909..dda2b3f7c 100644
--- a/src/NzbDrone.Core/Music/Handlers/ArtistScannedHandler.cs
+++ b/src/NzbDrone.Core/Music/Handlers/ArtistScannedHandler.cs
@@ -47,7 +47,7 @@ namespace NzbDrone.Core.Music
 
             _eventAggregator.PublishEvent(new ArtistAddCompletedEvent(artist));
 
-            if (artist.AddOptions.SearchForMissingAlbums)
+            if (addOptions.SearchForMissingAlbums)
             {
                 _commandQueueManager.Push(new MissingAlbumSearchCommand(artist.Id));
             }