1 files changed, 9 insertions, 0 deletions
diff --git a/indexer/index.hpp b/indexer/index.hpp
index 02ab500383..dafe1bca85 100644
--- a/indexer/index.hpp
+++ b/indexer/index.hpp
@@ -255,6 +255,15 @@ private:
     ASSERT_LESS(index, features.size(), ());
     size_t result = index;
     MwmId id = features[index].m_mwmId;
+
+    if (!id.IsAlive())
+    {
+      while (features[result].m_mwmId == id)
+        ++result;
+
+      return result;
+    }
+
     MwmHandle const handle = GetMwmHandleById(id);
     MwmValue const * pValue = handle.GetValue<MwmValue>();
     if (pValue)