diff --git a/src/NzbDrone.Common/Disk/DiskProviderBase.cs b/src/NzbDrone.Common/Disk/DiskProviderBase.cs
index 75eb8a9dd..5e90d2294 100644
--- a/src/NzbDrone.Common/Disk/DiskProviderBase.cs
+++ b/src/NzbDrone.Common/Disk/DiskProviderBase.cs
@@ -278,6 +278,11 @@ namespace NzbDrone.Common.Disk
 
         protected virtual void MoveFileInternal(string source, string destination)
         {
+            if (File.Exists(destination))
+            {
+                throw new FileAlreadyExistsException("File already exists", destination);
+            }
+
             _fileSystem.File.Move(source, destination);
         }
 
diff --git a/src/NzbDrone.Common/Disk/FileAlreadyExistsException.cs b/src/NzbDrone.Common/Disk/FileAlreadyExistsException.cs
new file mode 100644
index 000000000..69acb4cd7
--- /dev/null
+++ b/src/NzbDrone.Common/Disk/FileAlreadyExistsException.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace NzbDrone.Common.Disk
+{
+    public class FileAlreadyExistsException : Exception
+    {
+        public string Filename { get; set; }
+
+        public FileAlreadyExistsException(string message, string filename)
+            : base(message)
+        {
+            Filename = filename;
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/MediaFiles/RenameTrackFileService.cs b/src/NzbDrone.Core/MediaFiles/RenameTrackFileService.cs
index dde85f681..ca5209abc 100644
--- a/src/NzbDrone.Core/MediaFiles/RenameTrackFileService.cs
+++ b/src/NzbDrone.Core/MediaFiles/RenameTrackFileService.cs
@@ -135,6 +135,10 @@ namespace NzbDrone.Core.MediaFiles
 
                     _eventAggregator.PublishEvent(new TrackFileRenamedEvent(artist, trackFile, previousPath));
                 }
+                catch (FileAlreadyExistsException ex)
+                {
+                    _logger.Warn("File not renamed, there is already a file at the destination: {0}", ex.Filename);
+                }
                 catch (SameFilenameException ex)
                 {
                     _logger.Debug("File not renamed, source and destination are the same: {0}", ex.Filename);