diff --git a/src/NzbDrone.Core/Download/CompletedDownloadService.cs b/src/NzbDrone.Core/Download/CompletedDownloadService.cs
index 54ce286511..64b594c7b7 100644
--- a/src/NzbDrone.Core/Download/CompletedDownloadService.cs
+++ b/src/NzbDrone.Core/Download/CompletedDownloadService.cs
@@ -50,7 +50,8 @@ public CompletedDownloadService(IConfigService configService,
 
         public void Process(TrackedDownload trackedDownload, bool ignoreWarnings = false)
         {
-            if (trackedDownload.DownloadItem.Status != DownloadItemStatus.Completed)
+            if (trackedDownload.DownloadItem.Status != DownloadItemStatus.Completed ||
+                trackedDownload.RemoteAlbum == null)
             {
                 return;
             }
@@ -80,7 +81,7 @@ public void Process(TrackedDownload trackedDownload, bool ignoreWarnings = false
                     return;
                 }
 
-                var artist = trackedDownload.RemoteAlbum?.Artist;
+                var artist = trackedDownload.RemoteAlbum.Artist;
 
                 if (artist == null)
                 {
diff --git a/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs b/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs
index 8a2a262442..8f0ca4e626 100644
--- a/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs
+++ b/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs
@@ -156,6 +156,7 @@ public TrackedDownload TrackDownload(DownloadClientDefinition downloadClient, Do
                 if (trackedDownload.RemoteAlbum == null)
                 {
                     _logger.Trace("No Album found for download '{0}'", trackedDownload.DownloadItem.Title);
+                    trackedDownload.Warn("No Album found for download '{0}'", trackedDownload.DownloadItem.Title);
                 }
             }
             catch (Exception e)