diff --git a/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDownloadFixture.cs b/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDownloadFixture.cs
index 6504591c0..ff81b34f9 100644
--- a/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDownloadFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDownloadFixture.cs
@@ -425,11 +425,20 @@ namespace NzbDrone.Core.Test.ProviderTests.PostDownloadProviderTests
             var downloadName = new DirectoryInfo(@"C:\Test\Drop\30.Rock.S01E01.Pilot");
 
             WithValidSeries();
+            WithLotsOfFreeDiskSpace();
+            WithImportedFiles(downloadName.FullName);
 
             Mocker.GetMock<DiskProvider>()
                     .Setup(s => s.FolderExists(fakeSeries.Path))
                     .Returns(false);
 
+            Mocker.GetMock<SeriesProvider>().Setup(s => s.FindSeries("office")).Returns(fakeSeries);
+            Mocker.GetMock<DiskScanProvider>().Setup(s => s.CleanUpDropFolder(downloadName.FullName));
+            Mocker.GetMock<DiskScanProvider>().Setup(s => s.MoveEpisodeFile(It.IsAny<EpisodeFile>(), true)).Returns(new EpisodeFile());
+            Mocker.GetMock<DiskProvider>().Setup(s => s.GetDirectorySize(downloadName.FullName)).Returns(Constants.IgnoreFileSize - 1.Megabytes());
+            Mocker.GetMock<DiskProvider>().Setup(s => s.DeleteFolder(downloadName.FullName, true));
+            Mocker.GetMock<DiskProvider>().Setup(s => s.IsFolderLocked(downloadName.FullName)).Returns(false);
+
             Mocker.Resolve<PostDownloadProvider>().ProcessDownload(downloadName);
 
             Mocker.GetMock<DiskProvider>().Verify(c => c.CreateDirectory(fakeSeries.Path), Times.Once());
diff --git a/NzbDrone.Core/Providers/PostDownloadProvider.cs b/NzbDrone.Core/Providers/PostDownloadProvider.cs
index c3373698a..6e57b8ae6 100644
--- a/NzbDrone.Core/Providers/PostDownloadProvider.cs
+++ b/NzbDrone.Core/Providers/PostDownloadProvider.cs
@@ -89,7 +89,6 @@ namespace NzbDrone.Core.Providers
             {
                 Logger.Warn("Series Folder doesn't exist: {0}, creating it.", series.Path);
                 _diskProvider.CreateDirectory(series.Path);
-                return;
             }
 
             var size = _diskProvider.GetDirectorySize(subfolderInfo.FullName);