diff --git a/NzbDrone.Core/Jobs/RenameSeasonJob.cs b/NzbDrone.Core/Jobs/RenameSeasonJob.cs
index e379d9ab6..72da83101 100644
--- a/NzbDrone.Core/Jobs/RenameSeasonJob.cs
+++ b/NzbDrone.Core/Jobs/RenameSeasonJob.cs
@@ -69,12 +69,13 @@ namespace NzbDrone.Core.Jobs
             {
                 try
                 {
+                    var oldFile = new EpisodeFile(episodeFile);
                     var newFile = _diskScanProvider.MoveEpisodeFile(episodeFile);
 
                     if (newFile != null)
                     {
                         newEpisodeFiles.Add(newFile);
-                        oldEpisodeFiles.Add(episodeFile);
+                        oldEpisodeFiles.Add(oldFile);
                     }
                 }
 
diff --git a/NzbDrone.Core/Jobs/RenameSeriesJob.cs b/NzbDrone.Core/Jobs/RenameSeriesJob.cs
index f44f85786..ceabbf555 100644
--- a/NzbDrone.Core/Jobs/RenameSeriesJob.cs
+++ b/NzbDrone.Core/Jobs/RenameSeriesJob.cs
@@ -66,12 +66,13 @@ namespace NzbDrone.Core.Jobs
             {
                 try
                 {
+                    var oldFile = new EpisodeFile(episodeFile);
                     var newFile = _diskScanProvider.MoveEpisodeFile(episodeFile);
 
                     if (newFile != null)
                     {
                         newEpisodeFiles.Add(newFile);
-                        oldEpisodeFiles.Add(episodeFile);
+                        oldEpisodeFiles.Add(oldFile);
                     }
                 }
 
diff --git a/NzbDrone.Core/Providers/Metadata/Xbmc.cs b/NzbDrone.Core/Providers/Metadata/Xbmc.cs
index 46a7bb59f..87b77583d 100644
--- a/NzbDrone.Core/Providers/Metadata/Xbmc.cs
+++ b/NzbDrone.Core/Providers/Metadata/Xbmc.cs
@@ -16,7 +16,8 @@ namespace NzbDrone.Core.Providers.Metadata
 {
     public class Xbmc : MetadataBase
     {
-        public Xbmc(ConfigProvider configProvider, DiskProvider diskProvider, BannerProvider bannerProvider, EpisodeProvider episodeProvider)
+        public Xbmc(ConfigProvider configProvider, DiskProvider diskProvider, 
+                    BannerProvider bannerProvider, EpisodeProvider episodeProvider)
             : base(configProvider, diskProvider, bannerProvider, episodeProvider)
         {
         }
diff --git a/NzbDrone.Core/Providers/MetadataProvider.cs b/NzbDrone.Core/Providers/MetadataProvider.cs
index 3907ce274..80c892d34 100644
--- a/NzbDrone.Core/Providers/MetadataProvider.cs
+++ b/NzbDrone.Core/Providers/MetadataProvider.cs
@@ -21,7 +21,8 @@ namespace NzbDrone.Core.Providers
         private readonly TvDbProvider _tvDbProvider;
 
         [Inject]
-        public MetadataProvider(IDatabase database, IEnumerable<MetadataBase> metadataProviders, TvDbProvider tvDbProvider)
+        public MetadataProvider(IDatabase database, IEnumerable<MetadataBase> metadataProviders,
+                                TvDbProvider tvDbProvider)
         {
             _database = database;
             _metadataProviders = metadataProviders;
@@ -121,6 +122,9 @@ namespace NzbDrone.Core.Providers
 
         public virtual void CreateForEpisodeFiles(List<EpisodeFile> episodeFiles)
         {
+            if (episodeFiles == null || !episodeFiles.Any())
+                return;
+            
             var tvDbSeries = _tvDbProvider.GetSeries(episodeFiles.First().SeriesId, true, true);
 
             foreach(var episodeFile in episodeFiles)
@@ -158,10 +162,5 @@ namespace NzbDrone.Core.Providers
                 }
             }
         }
-
-        public virtual void RenameForEpisodeFile(EpisodeFile episodeFile)
-        {
-            
-        }
     }
 }
\ No newline at end of file
diff --git a/NzbDrone.Core/Repository/EpisodeFile.cs b/NzbDrone.Core/Repository/EpisodeFile.cs
index 44820c64c..01b17f3b7 100644
--- a/NzbDrone.Core/Repository/EpisodeFile.cs
+++ b/NzbDrone.Core/Repository/EpisodeFile.cs
@@ -9,6 +9,22 @@ namespace NzbDrone.Core.Repository
     [PrimaryKey("EpisodeFileId", autoIncrement = true)]
     public class EpisodeFile
     {
+        public EpisodeFile()
+        {
+            
+        }
+
+        public EpisodeFile(EpisodeFile source)
+        {
+            EpisodeFileId = source.EpisodeFileId;
+            SeriesId = source.SeriesId;
+            SeasonNumber = source.SeasonNumber;
+            Path = source.Path;
+            Quality = source.Quality;
+            Proper = source.Proper;
+            Size = source.Size;
+        }
+
         public int EpisodeFileId { get; set; }
 
         public int SeriesId { get; set; }