diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp
index 6c10850a1a..68c2922e7a 100644
--- a/indexer/osm_editor.cpp
+++ b/indexer/osm_editor.cpp
@@ -331,7 +331,8 @@ Editor::FeatureStatus Editor::GetFeatureStatus(MwmSet::MwmId const & mwmId, uint
 
 bool Editor::IsFeatureUploaded(MwmSet::MwmId const & mwmId, uint32_t index) const
 {
-  return GetFeatureTypeInfo(mwmId, index)->m_uploadStatus == kUploaded;
+  auto const * info = GetFeatureTypeInfo(mwmId, index)
+  return info && info->m_uploadStatus == kUploaded;
 }
 
 void Editor::DeleteFeature(FeatureType const & feature)