diff --git a/src/NzbDrone.Core.Test/Download/CompletedDownloadServiceFixture.cs b/src/NzbDrone.Core.Test/Download/CompletedDownloadServiceFixture.cs
index 9cb666365..acb65a85c 100644
--- a/src/NzbDrone.Core.Test/Download/CompletedDownloadServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/CompletedDownloadServiceFixture.cs
@@ -176,6 +176,16 @@ namespace NzbDrone.Core.Test.Download
             AssertNoAttemptedImport();
         }
 
+        [Test]
+        public void should_not_throw_if_remotealbum_is_null()
+        {
+            _trackedDownload.RemoteAlbum = null;
+
+            Subject.Process(_trackedDownload);
+
+            AssertNoAttemptedImport();
+        }
+
         [Test]
         public void should_mark_as_imported_if_all_tracks_were_imported()
         {
diff --git a/src/NzbDrone.Core/Download/CompletedDownloadService.cs b/src/NzbDrone.Core/Download/CompletedDownloadService.cs
index 19c39da7a..54ce28651 100644
--- a/src/NzbDrone.Core/Download/CompletedDownloadService.cs
+++ b/src/NzbDrone.Core/Download/CompletedDownloadService.cs
@@ -80,7 +80,7 @@ namespace NzbDrone.Core.Download
                     return;
                 }
 
-                var artist = trackedDownload.RemoteAlbum.Artist;
+                var artist = trackedDownload.RemoteAlbum?.Artist;
 
                 if (artist == null)
                 {