diff --git a/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoFormatter.cs b/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoFormatter.cs
index 78a05aedc..8a5eaa707 100644
--- a/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoFormatter.cs
+++ b/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoFormatter.cs
@@ -44,6 +44,11 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
         {
             var audioFormat = mediaInfo.AudioFormat;
 
+            if (audioFormat.IsNullOrWhiteSpace())
+            {
+                return audioFormat;
+            }
+
             if (audioFormat == "AC-3")
             {
                 return "AC3";
@@ -77,6 +82,11 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
         {
             var videoCodec = mediaInfo.VideoCodec;
 
+            if (videoCodec.IsNullOrWhiteSpace())
+            {
+                return videoCodec;
+            }
+
             if (videoCodec == "AVC")
             {
                 return sceneName.IsNotNullOrWhiteSpace() && Path.GetFileNameWithoutExtension(sceneName).Contains("h264")
@@ -96,6 +106,11 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
                 return "MPEG2";
             }
 
+            if (videoCodec.Equals("XviD", StringComparison.OrdinalIgnoreCase))
+            {
+                return "XviD";
+            }
+
             Logger.Error("Unknown video codec: {0}", videoCodec);
             return videoCodec;
         }