diff --git a/indexer/mwm_set.cpp b/indexer/mwm_set.cpp
index 7035741bcc..8432cd1e6b 100644
--- a/indexer/mwm_set.cpp
+++ b/indexer/mwm_set.cpp
@@ -266,10 +266,7 @@ void MwmSet::ClearCache()
 MwmSet::MwmId MwmSet::GetMwmIdByCountryFile(CountryFile const & countryFile) const
 {
   lock_guard<mutex> lock(m_lock);
-
-  MwmId const id = GetMwmIdByCountryFileImpl(countryFile);
-  ASSERT(id.IsAlive(), ("Can't get an mwm's (", countryFile.GetNameWithoutExt(), ") identifier."));
-  return id;
+  return GetMwmIdByCountryFileImpl(countryFile);
 }
 
 MwmSet::MwmHandle MwmSet::GetMwmHandleByCountryFile(CountryFile const & countryFile)
diff --git a/routing/road_graph_router.cpp b/routing/road_graph_router.cpp
index f4b50e0eeb..958d812d0f 100644
--- a/routing/road_graph_router.cpp
+++ b/routing/road_graph_router.cpp
@@ -157,9 +157,8 @@ void RoadGraphRouter::ClearState()
 
 bool RoadGraphRouter::CheckMapExistence(m2::PointD const & point, Route & route) const
 {
-  string fileName = m_countryFileFn(point);
-  LocalCountryFile localCountryFile = m_index.GetMwmHandleByCountryFile(CountryFile(fileName)).GetInfo()->GetLocalFile();
-  if (!HasOptions(localCountryFile.GetFiles(), MapOptions::Map))
+  string const fileName = m_countryFileFn(point);
+  if (!m_index.GetMwmIdByCountryFile(CountryFile(fileName)).IsAlive())
   {
     route.AddAbsentCountry(fileName);
     return false;