diff --git a/indexer/indexer_tool/osm_element.hpp b/indexer/indexer_tool/osm_element.hpp
index 16d3f9b258..39229a7a26 100644
--- a/indexer/indexer_tool/osm_element.hpp
+++ b/indexer/indexer_tool/osm_element.hpp
@@ -88,6 +88,8 @@ protected:
   template <class ToDo>
   void ProcessWayPoints(way_map_t & m, ToDo toDo)
   {
+    if (m.empty()) return;
+
     uint64_t id = m.begin()->first;
     uint64_t const first = id;