diff --git a/grid_map_core/src/iterators/SpiralIterator.cpp b/grid_map_core/src/iterators/SpiralIterator.cpp
index 2284d2576..50eb55408 100644
--- a/grid_map_core/src/iterators/SpiralIterator.cpp
+++ b/grid_map_core/src/iterators/SpiralIterator.cpp
@@ -49,6 +49,9 @@ const Eigen::Array2i& SpiralIterator::operator *() const
 
 SpiralIterator& SpiralIterator::operator ++()
 {
+  if (isPastEnd()) {
+    return *this;
+  }
   pointsRing_.pop_back();
   if (pointsRing_.empty() && !isPastEnd()) {
     generateRing();