Merge pull request #956 from MediaBrowser/dev

3.0.5464.40000

1 files changed, 5 insertions, 1 deletions

diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index 6b098cbd8..0c6125dbe 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -363,7 +363,11 @@ namespace MediaBrowser.Controller.Entities
         {
             await base.UpdateToRepository(updateReason, cancellationToken).ConfigureAwait(false);
 
-            foreach (var item in GetLocalAlternateVersionIds().Select(i => LibraryManager.GetItemById(i)))
+            var localAlternates = GetLocalAlternateVersionIds()
+                .Select(i => LibraryManager.GetItemById(i))
+                .Where(i => i != null);
+
+            foreach (var item in localAlternates)
             {
                 item.ImageInfos = ImageInfos;
                 item.Overview = Overview;