diff --git a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
index bdc4fcf45a..81cf230938 100644
--- a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
+++ b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
@@ -84,10 +84,12 @@ namespace MediaBrowser.Server.Implementations.Configuration
         {
             var newConfig = (ServerConfiguration) newConfiguration;
 
-            if (!string.Equals(Configuration.ItemsByNamePath, newConfig.ItemsByNamePath))
+            var newIbnPath = newConfig.ItemsByNamePath ?? string.Empty;
+
+            if (!string.Equals(Configuration.ItemsByNamePath ?? string.Empty, newIbnPath))
             {
                 // Validate
-                if (!Directory.Exists(newConfig.ItemsByNamePath))
+                if (!Directory.Exists(newIbnPath))
                 {
                     throw new DirectoryNotFoundException(string.Format("{0} does not exist.", newConfig.ItemsByNamePath));
                 }