1 files changed, 10 insertions, 2 deletions
diff --git a/cpp/src/Ice/ObjectFactoryManager.cpp b/cpp/src/Ice/ObjectFactoryManager.cpp
index bccc543a15c..49bb6537e1b 100644
--- a/cpp/src/Ice/ObjectFactoryManager.cpp
+++ b/cpp/src/Ice/ObjectFactoryManager.cpp
@@ -49,8 +49,16 @@ IceInternal::ObjectFactoryManager::remove(const string& id)
     if (p != _factoryMap.end())
     {
 	p->second->destroy();
-	_factoryMap.erase(p);
-	_factoryMapHint = _factoryMap.end();
+
+	if (p == _factoryMapHint)
+	{
+	    _factoryMap.erase(p++);
+	    _factoryMapHint = p;
+	}
+	else
+	{
+	    _factoryMap.erase(p);
+	}
     }
 }