diff --git a/routing/routing_integration_tests/routing_test_tools.cpp b/routing/routing_integration_tests/routing_test_tools.cpp
index 025ec7ef23..47421e4489 100644
--- a/routing/routing_integration_tests/routing_test_tools.cpp
+++ b/routing/routing_integration_tests/routing_test_tools.cpp
@@ -28,6 +28,7 @@
 #include "geometry/latlon.hpp"
 
 #include "base/math.hpp"
+#include "base/stl_helpers.hpp"
 
 #include "private.h"
 
@@ -71,14 +72,8 @@ shared_ptr<model::FeaturesFetcher> CreateFeaturesFetcher(vector<LocalCountryFile
   featuresFetcher->InitClassificator();
 
   for (LocalCountryFile const & localFile : localFiles)
-  {
-    auto p = featuresFetcher->RegisterMap(localFile);
-    if (p.second != MwmSet::RegResult::Success)
-    {
-      ASSERT(false, ("Can't register", localFile));
-      return nullptr;
-    }
-  }
+    featuresFetcher->RegisterMap(localFile);
+
   return featuresFetcher;
 }
 
@@ -110,7 +105,10 @@ unique_ptr<IndexRouter> CreateVehicleRouter(DataSource & dataSource,
   {
     auto const & countryFile = f.GetCountryFile();
     auto const mwmId = dataSource.GetMwmIdByCountryFile(countryFile);
-    CHECK(mwmId.IsAlive(), ());
+
+    if (!mwmId.IsAlive())
+      continue;
+
     if (countryParentGetter->GetStorageForTesting().IsLeaf(countryFile.GetName()))
       numMwmIds->RegisterFile(countryFile);
   }
diff --git a/routing/routing_quality/utils.cpp b/routing/routing_quality/utils.cpp
index 582754ef6f..95e7c38279 100644
--- a/routing/routing_quality/utils.cpp
+++ b/routing/routing_quality/utils.cpp
@@ -83,7 +83,9 @@ private:
       UNUSED_VALUE(m_dataSource.RegisterMap(localFile));
       auto const & countryFile = localFile.GetCountryFile();
       auto const mwmId = m_dataSource.GetMwmIdByCountryFile(countryFile);
-      CHECK(mwmId.IsAlive(), ());
+
+      if (!mwmId.IsAlive())
+        continue;
 
       // Only maps from countries.txt should be used for tests.
       if (m_cpg->GetStorageForTesting().IsLeaf(countryFile.GetName()))