diff --git a/src/NzbDrone.Core/Queue/QueueService.cs b/src/NzbDrone.Core/Queue/QueueService.cs
index 208a0d3ea..875f3394e 100644
--- a/src/NzbDrone.Core/Queue/QueueService.cs
+++ b/src/NzbDrone.Core/Queue/QueueService.cs
@@ -72,7 +72,7 @@ private Queue MapQueueItem(TrackedDownload trackedDownload, Album album)
             
             var queue = new Queue
             {
-                Artist = trackedDownload.RemoteAlbum.Artist,
+                Artist = trackedDownload.RemoteAlbum?.Artist,
                 Album = album,
                 Language = trackedDownload.RemoteAlbum?.ParsedAlbumInfo.Language ?? Language.Unknown,
                 Quality = trackedDownload.RemoteAlbum?.ParsedAlbumInfo.Quality ?? new QualityModel(Quality.Unknown),
@@ -101,7 +101,6 @@ private Queue MapQueueItem(TrackedDownload trackedDownload, Album album)
                 queue.Id = HashConverter.GetHashInt31(string.Format("trackedDownload-{0}", trackedDownload.DownloadItem.DownloadId));
             }
 
-
             if (queue.Timeleft.HasValue)
             {
                 queue.EstimatedCompletionTime = DateTime.UtcNow.Add(queue.Timeleft.Value);
@@ -117,6 +116,5 @@ public void Handle(TrackedDownloadRefreshedEvent message)
 
             _eventAggregator.PublishEvent(new QueueUpdatedEvent());
         }
-
     }
 }