From e9fb806478e974b200b54f8acff5eb09bdef4c32 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 28 Apr 2014 23:56:20 -0400
Subject: 3.0.5231.40980

---
 MediaBrowser.Server.Implementations/Session/SessionManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Session')

diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 30d9976f0..b0e31a50c 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -264,7 +264,7 @@ namespace MediaBrowser.Server.Implementations.Session
         /// <param name="libraryItem">The library item.</param>
         private void UpdateNowPlayingItem(SessionInfo session, PlaybackProgressInfo info, BaseItem libraryItem)
         {
-            var runtimeTicks = libraryItem.RunTimeTicks;
+            var runtimeTicks = libraryItem == null ? null : libraryItem.RunTimeTicks;
 
             if (string.IsNullOrWhiteSpace(info.MediaSourceId))
             {
@@ -277,7 +277,7 @@ namespace MediaBrowser.Server.Implementations.Session
                 runtimeTicks = _libraryManager.GetItemById(new Guid(info.MediaSourceId)).RunTimeTicks;
             }
 
-            if (!string.IsNullOrWhiteSpace(info.ItemId))
+            if (!string.IsNullOrWhiteSpace(info.ItemId) && libraryItem != null)
             {
                 info.Item = GetItemInfo(libraryItem, runtimeTicks);
             }
-- 
cgit v1.2.3