diff --git a/platform/local_country_file.cpp b/platform/local_country_file.cpp
index 4cf20444ce..2ccf776392 100644
--- a/platform/local_country_file.cpp
+++ b/platform/local_country_file.cpp
@@ -49,10 +49,7 @@ void LocalCountryFile::DeleteFromDisk(TMapOptions files) const
     if (OnDisk(file) && HasOptions(files, file))
     {
       if (!my::DeleteFileX(GetPath(file)))
-      {
         LOG(LERROR, (file, "from", *this, "wasn't deleted from disk."));
-        ASSERT(false, ());
-      }
     }
   }
 }
diff --git a/platform/local_country_file_utils.cpp b/platform/local_country_file_utils.cpp
index f97a6f7d6a..f462f92e3d 100644
--- a/platform/local_country_file_utils.cpp
+++ b/platform/local_country_file_utils.cpp
@@ -238,20 +238,20 @@ string CountryIndexes::GetPath(LocalCountryFile const & localFile, Index index)
 {
   string const directory = IndexesDir(localFile);
   string const name = localFile.GetCountryFile().GetNameWithoutExt();
-  string file;
+  char const * ext = nullptr;
   switch (index)
   {
     case Index::Bits:
-      file = name + ".bftsegbits";
+      ext = ".bftsegbits";
       break;
     case Index::Nodes:
-      file = name + ".bftsegnodes";
+      ext = ".bftsegnodes";
       break;
     case Index::Offsets:
-      file = name + ".offsets";
+      ext = ".offsets";
       break;
   }
-  return my::JoinFoldersToPath(directory, file);
+  return my::JoinFoldersToPath(directory, name + ext);
 }
 
 // static