diff --git a/MediaBrowser.Api/Library/LibraryHelpers.cs b/MediaBrowser.Api/Library/LibraryHelpers.cs
index 67e1160f7f..ff0915d78f 100644
--- a/MediaBrowser.Api/Library/LibraryHelpers.cs
+++ b/MediaBrowser.Api/Library/LibraryHelpers.cs
@@ -76,6 +76,11 @@ namespace MediaBrowser.Api.Library
             }
 
             if (!string.Equals(currentPath, newPath, StringComparison.OrdinalIgnoreCase) && Directory.Exists(newPath))
+            {
+                throw new ArgumentException("There is already a media collection with the name " + newPath + ".");
+            }
+            //Only make a two-phase move when changing capitalization
+            if (string.Equals(currentPath, newPath, StringComparison.OrdinalIgnoreCase))
             {
                 //Create an unique name
                 var temporaryName = Guid.NewGuid().ToString();
@@ -83,6 +88,7 @@ namespace MediaBrowser.Api.Library
                 Directory.Move(currentPath,temporaryPath);
                 currentPath = temporaryPath;
             }
+
             Directory.Move(currentPath, newPath);
         }