add error handling

2 files changed, 13 insertions, 10 deletions

diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs
index 7f4db5a89..1abbce408 100644
--- a/MediaBrowser.Api/ApiEntryPoint.cs
+++ b/MediaBrowser.Api/ApiEntryPoint.cs
@@ -709,7 +709,10 @@ namespace MediaBrowser.Api
 
         public void StartKillTimer(TimerCallback callback, int intervalMs)
         {
-            CheckHasExited();
+            if (HasExited)
+            {
+                return;
+            }
 
             lock (_timerLock)
             {
@@ -728,7 +731,10 @@ namespace MediaBrowser.Api
 
         public void ChangeKillTimerIfStarted()
         {
-            CheckHasExited();
+            if (HasExited)
+            {
+                return;
+            }
 
             lock (_timerLock)
             {
@@ -741,14 +747,6 @@ namespace MediaBrowser.Api
                 }
             }
         }
-
-        private void CheckHasExited()
-        {
-            if (HasExited)
-            {
-                throw new ObjectDisposedException("Job");
-            }
-        }
     }
 
     /// <summary>
diff --git a/MediaBrowser.Api/Library/LibraryHelpers.cs b/MediaBrowser.Api/Library/LibraryHelpers.cs
index 111922bca..2e0afa411 100644
--- a/MediaBrowser.Api/Library/LibraryHelpers.cs
+++ b/MediaBrowser.Api/Library/LibraryHelpers.cs
@@ -56,6 +56,11 @@ namespace MediaBrowser.Api.Library
         /// <param name="appPaths">The app paths.</param>
         public static void AddMediaPath(IFileSystem fileSystem, string virtualFolderName, string path, IServerApplicationPaths appPaths)
         {
+            if (!string.IsNullOrWhiteSpace(path))
+            {
+                throw new ArgumentNullException("path");
+            }
+
 			if (!fileSystem.DirectoryExists(path))
             {
                 throw new DirectoryNotFoundException("The path does not exist.");