diff --git a/src/NzbDrone.Core/Parser/Parser.cs b/src/NzbDrone.Core/Parser/Parser.cs
index 8127df11a..064b11ad7 100644
--- a/src/NzbDrone.Core/Parser/Parser.cs
+++ b/src/NzbDrone.Core/Parser/Parser.cs
@@ -279,12 +279,6 @@ namespace NzbDrone.Core.Parser
                 result = ParseTitle(fileInfo.Directory.Name + fileInfo.Extension);
             }
 
-            if (result == null)
-            {
-                Logger.Warn("Unable to parse episode info from path {0}", path);
-                return null;
-            }
-
             return result;
         }
 
diff --git a/src/NzbDrone.Core/Parser/ParsingService.cs b/src/NzbDrone.Core/Parser/ParsingService.cs
index 5e8096790..beeebeb1a 100644
--- a/src/NzbDrone.Core/Parser/ParsingService.cs
+++ b/src/NzbDrone.Core/Parser/ParsingService.cs
@@ -6,6 +6,7 @@ using NLog;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.DataAugmentation.Scene;
 using NzbDrone.Core.IndexerSearch.Definitions;
+using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Tv;
 
@@ -73,6 +74,11 @@ namespace NzbDrone.Core.Parser
 
             if (parsedEpisodeInfo == null)
             {
+                if (MediaFileExtensions.Extensions.Contains(Path.GetExtension(filename)))
+                {
+                    _logger.Warn("Unable to parse episode info from path {0}", filename);
+                }
+
                 return null;
             }