diff --git a/search/features_layer_matcher.cpp b/search/features_layer_matcher.cpp
index e9fc383865..a1a144f17d 100644
--- a/search/features_layer_matcher.cpp
+++ b/search/features_layer_matcher.cpp
@@ -96,6 +96,9 @@ uint32_t FeaturesLayerMatcher::GetMatchingStreet(FeatureType & houseFeature)
   result = kInvalidId;
 
   FeatureID streetId;
+  CHECK(m_context, ());
+  CHECK(m_context->m_handle.IsAlive(), (m_context->m_handle.GetId()));
+  CHECK(m_context->m_handle.GetId().IsAlive(), (m_context->m_handle.GetId()));
   if (!edited && m_reverseGeocoder.GetStreetByHouse(houseFeature, streetId))
   {
     result = streetId.m_index;
diff --git a/search/reverse_geocoder.cpp b/search/reverse_geocoder.cpp
index ad651ad42b..91d5ea0df1 100644
--- a/search/reverse_geocoder.cpp
+++ b/search/reverse_geocoder.cpp
@@ -289,6 +289,7 @@ bool ReverseGeocoder::GetNearbyAddress(HouseTable & table, Building const & bld,
   case HouseToStreetTable::StreetIdType::FeatureId:
   {
     FeatureID streetFeature(bld.m_id.m_mwmId, streetId);
+    CHECK(bld.m_id.m_mwmId.IsAlive(), (bld.m_id.m_mwmId));
     m_dataSource.ReadFeature(
         [&bld, &addr](FeatureType & ft) {
           string streetName;
@@ -297,7 +298,7 @@ bool ReverseGeocoder::GetNearbyAddress(HouseTable & table, Building const & bld,
           addr.m_street = Street(ft.GetID(), distance, streetName, ft.GetNames());
         },
         streetFeature);
-    CHECK(!addr.m_street.m_name.empty(), ());
+    CHECK(!addr.m_street.m_multilangName.IsEmpty(), (bld.m_id.m_mwmId, streetId));
     addr.m_building = bld;
     return true;
   }