diff --git a/platform/http_request.cpp b/platform/http_request.cpp
index 1787b05294..4afdbcffc5 100644
--- a/platform/http_request.cpp
+++ b/platform/http_request.cpp
@@ -277,7 +277,9 @@ class FileHttpRequest : public HttpRequest, public IHttpThreadCallback
         (void)my::DeleteFileX(m_filePath + RESUME_FILE_EXTENSION);
 
         // Rename finished file to it's original name.
-        (void)my::DeleteFileX(m_filePath);
+        uint64_t sz = 0;
+        if (my::GetFileSize(m_filePath, sz))
+          (void)my::DeleteFileX(m_filePath);
         CHECK(my::RenameFileX(m_filePath + DOWNLOADING_FILE_EXTENSION, m_filePath), ());
 
         DisableBackupForFile(m_filePath);
diff --git a/platform/servers_list.cpp b/platform/servers_list.cpp
index f705a6f3f2..a87485454a 100644
--- a/platform/servers_list.cpp
+++ b/platform/servers_list.cpp
@@ -35,14 +35,10 @@ bool ParseServerList(string const & jsonStr, vector<string> & outUrls)
 void GetServerListFromRequest(HttpRequest const & request, vector<string> & urls)
 {
   if (request.Status() == HttpRequest::ECompleted && ParseServerList(request.Data(), urls))
-  {
     return;
-  }
-  else
-  {
-    VERIFY(ParseServerList(GetPlatform().DefaultUrlsJSON(), urls), ());
-    LOG(LWARNING, ("Can't get servers list from request, using default servers:", urls));
-  }
+
+  VERIFY(ParseServerList(GetPlatform().DefaultUrlsJSON(), urls), ());
+  LOG(LWARNING, ("Can't get servers list from request, using default servers:", urls));
 }
 
 } // namespace downloader
diff --git a/storage/storage_integration_tests/storage_http_tests.cpp b/storage/storage_integration_tests/storage_http_tests.cpp
index 80595e2a92..202a09a7d0 100644
--- a/storage/storage_integration_tests/storage_http_tests.cpp
+++ b/storage/storage_integration_tests/storage_http_tests.cpp
@@ -62,10 +62,6 @@ UNIT_TEST(StorageDownloadNodeAndDeleteNodeTests)
   storage.SetDownloadingUrlsForTesting({kTestWebServer});
   string const version = strings::to_string(storage.GetCurrentDataVersion());
   tests_support::ScopedDir cleanupVersionDir(version);
-  MY_SCOPE_GUARD(cleanup,
-                 bind(&Storage::DeleteNode, &storage, kCountryId));
-  DeleteDownloaderFilesForCountry(storage.GetCurrentDataVersion(),
-                                  kMapTestDir, CountryFile(kCountryId));
 
   string const mwmFullPath = my::JoinFoldersToPath({GetPlatform().WritableDir(), version},
                                                    kCountryId + DATA_FILE_EXTENSION);