diff --git a/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs b/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs
index 58ac71464..c4a34a9cc 100644
--- a/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs
+++ b/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs
@@ -164,50 +164,25 @@ public List<RemoteEpisode> GetPendingRemoteEpisodes(int seriesId)
 
             foreach (var pendingRelease in pendingReleases)
             {
+                if (pendingRelease.RemoteEpisode.Episodes.Empty())
+                {
+                    var noEpisodeItem = GetQueueItem(pendingRelease, nextRssSync, null);
+
+                    noEpisodeItem.ErrorMessage = "Unable to find matching episode(s)";
+
+                    queued.Add(noEpisodeItem);
+
+                    continue;
+                }
+
                 foreach (var episode in pendingRelease.RemoteEpisode.Episodes)
                 {
-                    var ect = pendingRelease.Release.PublishDate.AddMinutes(GetDelay(pendingRelease.RemoteEpisode));
-
-                    if (ect < nextRssSync.Value)
-                    {
-                        ect = nextRssSync.Value;
-                    }
-                    else
-                    {
-                        ect = ect.AddMinutes(_configService.RssSyncInterval);
-                    }
-
-                    var timeleft = ect.Subtract(DateTime.UtcNow);
-
-                    if (timeleft.TotalSeconds < 0)
-                    {
-                        timeleft = TimeSpan.Zero;
-                    }
-
-                    var queue = new Queue.Queue
-                                {
-                                    Id = GetQueueId(pendingRelease, episode),
-                                    Series = pendingRelease.RemoteEpisode.Series,
-                                    Episode = episode,
-                                    Languages = pendingRelease.RemoteEpisode.Languages,
-                                    Quality = pendingRelease.RemoteEpisode.ParsedEpisodeInfo.Quality,
-                                    Title = pendingRelease.Title,
-                                    Size = pendingRelease.RemoteEpisode.Release.Size,
-                                    Sizeleft = pendingRelease.RemoteEpisode.Release.Size,
-                                    RemoteEpisode = pendingRelease.RemoteEpisode,
-                                    Timeleft = timeleft,
-                                    EstimatedCompletionTime = ect,
-                                    Status = pendingRelease.Reason.ToString(),
-                                    Protocol = pendingRelease.RemoteEpisode.Release.DownloadProtocol,
-                                    Indexer = pendingRelease.RemoteEpisode.Release.Indexer
-                                };
-
-                    queued.Add(queue);
+                    queued.Add(GetQueueItem(pendingRelease, nextRssSync, episode));
                 }
             }
 
             // Return best quality release for each episode
-            var deduped = queued.GroupBy(q => q.Episode.Id).Select(g =>
+            var deduped = queued.Where(q => q.Episode != null).GroupBy(q => q.Episode.Id).Select(g =>
             {
                 var series = g.First().Series;
 
@@ -323,10 +298,20 @@ private List<PendingRelease> IncludeRemoteEpisodes(List<PendingRelease> releases
                 }
                 else if (ValidateParsedEpisodeInfo.ValidateForSeriesType(release.ParsedEpisodeInfo, series))
                 {
-                    var remoteEpisode = _parsingService.Map(release.ParsedEpisodeInfo, series);
+                    try
+                    {
+                        var remoteEpisode = _parsingService.Map(release.ParsedEpisodeInfo, series);
 
-                    release.RemoteEpisode.MappedSeasonNumber = remoteEpisode.MappedSeasonNumber;
-                    release.RemoteEpisode.Episodes = remoteEpisode.Episodes;
+                        release.RemoteEpisode.MappedSeasonNumber = remoteEpisode.MappedSeasonNumber;
+                        release.RemoteEpisode.Episodes = remoteEpisode.Episodes;
+                    }
+                    catch (InvalidOperationException ex)
+                    {
+                        _logger.Debug(ex, ex.Message);
+
+                        release.RemoteEpisode.MappedSeasonNumber = release.ParsedEpisodeInfo.SeasonNumber;
+                        release.RemoteEpisode.Episodes = new List<Episode>();
+                    }
                 }
                 else
                 {
@@ -343,6 +328,47 @@ private List<PendingRelease> IncludeRemoteEpisodes(List<PendingRelease> releases
             return result;
         }
 
+        private Queue.Queue GetQueueItem(PendingRelease pendingRelease, Lazy<DateTime> nextRssSync, Episode episode)
+        {
+            var ect = pendingRelease.Release.PublishDate.AddMinutes(GetDelay(pendingRelease.RemoteEpisode));
+
+            if (ect < nextRssSync.Value)
+            {
+                ect = nextRssSync.Value;
+            }
+            else
+            {
+                ect = ect.AddMinutes(_configService.RssSyncInterval);
+            }
+
+            var timeleft = ect.Subtract(DateTime.UtcNow);
+
+            if (timeleft.TotalSeconds < 0)
+            {
+                timeleft = TimeSpan.Zero;
+            }
+
+            var queue = new Queue.Queue
+            {
+                Id = GetQueueId(pendingRelease, episode),
+                Series = pendingRelease.RemoteEpisode.Series,
+                Episode = episode,
+                Languages = pendingRelease.RemoteEpisode.Languages,
+                Quality = pendingRelease.RemoteEpisode.ParsedEpisodeInfo.Quality,
+                Title = pendingRelease.Title,
+                Size = pendingRelease.RemoteEpisode.Release.Size,
+                Sizeleft = pendingRelease.RemoteEpisode.Release.Size,
+                RemoteEpisode = pendingRelease.RemoteEpisode,
+                Timeleft = timeleft,
+                EstimatedCompletionTime = ect,
+                Status = pendingRelease.Reason.ToString(),
+                Protocol = pendingRelease.RemoteEpisode.Release.DownloadProtocol,
+                Indexer = pendingRelease.RemoteEpisode.Release.Indexer
+            };
+
+            return queue;
+        }
+
         private void Insert(DownloadDecision decision, PendingReleaseReason reason)
         {
             _repository.Insert(new PendingRelease
@@ -433,7 +459,7 @@ private PendingRelease FindPendingRelease(int queueId)
 
         private int GetQueueId(PendingRelease pendingRelease, Episode episode)
         {
-            return HashConverter.GetHashInt31(string.Format("pending-{0}-ep{1}", pendingRelease.Id, episode.Id));
+            return HashConverter.GetHashInt31(string.Format("pending-{0}-ep{1}", pendingRelease.Id, episode?.Id ?? 0));
         }
 
         private int PrioritizeDownloadProtocol(Series series, DownloadProtocol downloadProtocol)