From cf72693b25b38a827c0c332f7d0cc19e72d0fd37 Mon Sep 17 00:00:00 2001
From: Piotr Dziwinski <piotrdz@gmail.com>
Date: Sun, 6 Sep 2015 16:29:21 +0200
Subject: [PATCH] Fix another issue in #621

---
 src/object/object_manager.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/object/object_manager.h b/src/object/object_manager.h
index 5456ef92..c92715a9 100644
--- a/src/object/object_manager.h
+++ b/src/object/object_manager.h
@@ -72,7 +72,12 @@ private:
     CObjectIteratorProxy(CObjectMapCIt currentIt, CObjectMapCIt endIt)
      : m_currentIt(currentIt)
      , m_endIt(endIt)
-    {}
+    {
+        while (m_currentIt != m_endIt && m_currentIt->second == nullptr)
+        {
+            ++m_currentIt;
+        }
+    }
 
 public:
     CObject* operator*()