diff --git a/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs b/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs
index 80741132a..668957cf5 100644
--- a/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs
+++ b/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs
@@ -300,12 +300,12 @@ public void should_not_download_file_with_error()
         {
             var file = GetTempFilePath();
 
-            Assert.Throws<HttpException>(() => Subject.DownloadFile("https://download.readarr.com/wrongpath", file));
+            Assert.Throws<WebException>(() => Subject.DownloadFile("https://download.readarr.com/wrongpath", file));
 
             File.Exists(file).Should().BeFalse();
             File.Exists(file + ".part").Should().BeFalse();
 
-            ExceptionVerification.ExpectedWarns(1);
+            ExceptionVerification.ExpectedWarns(0);
         }
 
         [Test]
diff --git a/src/NzbDrone.Common/Http/HttpClient.cs b/src/NzbDrone.Common/Http/HttpClient.cs
index ff4522e35..856643b3e 100644
--- a/src/NzbDrone.Common/Http/HttpClient.cs
+++ b/src/NzbDrone.Common/Http/HttpClient.cs
@@ -258,6 +258,11 @@ public void DownloadFile(string url, string fileName, string userAgent = null)
                 }
 
                 stopWatch.Stop();
+                if (File.Exists(fileName))
+                {
+                    File.Delete(fileName);
+                }
+
                 File.Move(fileNamePart, fileName);
                 _logger.Debug("Downloading Completed. took {0:0}s", stopWatch.Elapsed.Seconds);
             }
@@ -266,7 +271,7 @@ public void DownloadFile(string url, string fileName, string userAgent = null)
                 if (File.Exists(fileNamePart))
                 {
                     File.Delete(fileNamePart);
-                }  
+                }
             }
         }