1 files changed, 10 insertions, 0 deletions
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 0d49607953..cdfe9ebef4 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -607,8 +607,18 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
                 throw new ArgumentNullException("timer");
             }
 
+            if (string.IsNullOrWhiteSpace(timer.ProgramId))
+            {
+                throw new InvalidOperationException("timer.ProgramId is null. Cannot record.");
+            }
+
             var info = GetProgramInfoFromCache(timer.ChannelId, timer.ProgramId);
 
+            if (info == null)
+            {
+                throw new InvalidOperationException(string.Format("Program with Id {0} not found", timer.ProgramId));
+            }
+
             var recordPath = RecordingPath;
 
             if (info.IsMovie)