diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index ec8dd8699..0ed87bbff 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -424,6 +424,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
private async Task RecordStream(TimerInfo timer, CancellationToken cancellationToken)
{
+ if (timer == null)
+ {
+ throw new ArgumentNullException("timer");
+ }
+
var mediaStreamInfo = await GetChannelStream(timer.ChannelId, null, CancellationToken.None);
var duration = (timer.EndDate - RecordingHelper.GetStartTime(timer)).TotalSeconds + timer.PrePaddingSeconds;
diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index a4649aeca..47fbf3c30 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -271,9 +271,6 @@ namespace MediaBrowser.WebDashboard.Api
html = html.Replace("", "");
}
- html = html.Replace("", "");
-
if (enableMinification)
{
try
@@ -300,6 +297,9 @@ namespace MediaBrowser.WebDashboard.Api
_logger.ErrorException("Error minifying html", ex);
}
}
+
+ html = html.Replace("", "");
}
var versionString = !string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase) ? "?v=" + appVersion : string.Empty;
@@ -316,7 +316,7 @@ namespace MediaBrowser.WebDashboard.Api
html = html.Replace("", "" + GetMetaTags(mode) + GetCommonCss(mode, appVersion));
- html = html.Replace("", GetInitialJavascript(mode, appVersion) + importsHtml + GetCommonJavascript(mode, appVersion)) + "";
+ html = html.Replace("", GetInitialJavascript(mode, appVersion) + importsHtml + GetCommonJavascript(mode, appVersion) + "");
var bytes = Encoding.UTF8.GetBytes(html);