diff --git a/src/NzbDrone.Common/Composition/AssemblyLoader.cs b/src/NzbDrone.Common/Composition/AssemblyLoader.cs
index 4e8eee8dc..b8f0629b0 100644
--- a/src/NzbDrone.Common/Composition/AssemblyLoader.cs
+++ b/src/NzbDrone.Common/Composition/AssemblyLoader.cs
@@ -75,10 +75,6 @@ namespace NzbDrone.Common.Composition
                 {
                     mappedName = "libsqlite3.so.0";
                 }
-                else if (libraryName == "mediainfo")
-                {
-                    mappedName = "libmediainfo.so.0";
-                }
             }
 
             return NativeLibrary.Load(mappedName, assembly, dllImportSearchPath);
diff --git a/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs b/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs
index 1bca63e54..2eaebf41c 100644
--- a/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs
+++ b/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs
@@ -77,7 +77,7 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
                     VideoProfile = analysis.PrimaryVideoStream?.Profile,
                     VideoBitrate = analysis.PrimaryVideoStream?.BitRate ?? 0,
                     VideoMultiViewCount = 1,
-                    VideoBitDepth = GetPixelFormat(analysis.PrimaryVideoStream?.PixelFormat).Components.Min(x => x.BitDepth),
+                    VideoBitDepth = GetPixelFormat(analysis.PrimaryVideoStream?.PixelFormat)?.Components.Min(x => x.BitDepth) ?? 8,
                     VideoColourPrimaries = analysis.PrimaryVideoStream?.ColorPrimaries,
                     VideoTransferCharacteristics = analysis.PrimaryVideoStream?.ColorTransfer,
                     DoviConfigurationRecord = analysis.PrimaryVideoStream?.SideDataList?.Find(x => x.GetType().Name == nameof(DoviConfigurationRecordSideData)) as DoviConfigurationRecordSideData,
@@ -87,7 +87,7 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
                     AudioCodecID = analysis.PrimaryAudioStream?.CodecTagString,
                     AudioProfile = analysis.PrimaryAudioStream?.Profile,
                     AudioBitrate = analysis.PrimaryAudioStream?.BitRate ?? 0,
-                    RunTime = GetBestRuntime(analysis.PrimaryAudioStream?.Duration, analysis.PrimaryVideoStream.Duration, analysis.Format.Duration),
+                    RunTime = GetBestRuntime(analysis.PrimaryAudioStream?.Duration, analysis.PrimaryVideoStream?.Duration, analysis.Format.Duration),
                     AudioStreamCount = analysis.AudioStreams.Count,
                     AudioChannels = analysis.PrimaryAudioStream?.Channels ?? 0,
                     AudioChannelPositions = analysis.PrimaryAudioStream?.ChannelLayout,
diff --git a/src/NzbDrone.Core/MediaFiles/MovieImport/DetectSample.cs b/src/NzbDrone.Core/MediaFiles/MovieImport/DetectSample.cs
index 9a948af1f..1caf7da6b 100644
--- a/src/NzbDrone.Core/MediaFiles/MovieImport/DetectSample.cs
+++ b/src/NzbDrone.Core/MediaFiles/MovieImport/DetectSample.cs
@@ -53,7 +53,7 @@ namespace NzbDrone.Core.MediaFiles.MovieImport
 
             if (!runTime.HasValue)
             {
-                _logger.Error("Failed to get runtime from the file, make sure mediainfo is available");
+                _logger.Error("Failed to get runtime from the file, make sure ffprobe is available");
                 return DetectSampleResult.Indeterminate;
             }