2 files changed, 5 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 40d93e8ef..e89c83397 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -1217,7 +1217,7 @@ namespace MediaBrowser.Server.Implementations.Library
         {
             var result = ItemRepository.GetItemIdsList(query);
 
-            var items = result.Select(GetItemById).ToArray();
+            var items = result.Select(GetItemById).Where(i => i != null).ToArray();
 
             return new QueryResult<BaseItem>
             {
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index b96e3b26c..c90b9eacb 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -541,13 +541,16 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
                 }
 
                 recording.Status = RecordingStatus.Completed;
+                _logger.Info("Recording completed");
             }
             catch (OperationCanceledException)
             {
+                _logger.Info("Recording cancelled");
                 recording.Status = RecordingStatus.Completed;
             }
-            catch
+            catch (Exception ex)
             {
+                _logger.ErrorException("Error recording", ex);
                 recording.Status = RecordingStatus.Error;
             }