diff --git a/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs b/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs
index 0757b1495..f0c8b05b2 100644
--- a/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs
+++ b/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs
@@ -68,6 +68,13 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
                     if (newDownload)
                     {
                         episodeFile = _episodeFileUpgrader.UpgradeEpisodeFile(episodeFile, localEpisode);
+
+                        if (episodeFile == null)
+                        {
+                            _logger.Error("Failed to move [{0}], aborting processing", localEpisode);
+                            continue;
+                        }
+
                         _messageAggregator.PublishEvent(new EpisodeImportedEvent(episodeFile));
                     }