1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/Ice/RequestHandlerFactory.cpp b/cpp/src/Ice/RequestHandlerFactory.cpp
index e21344c98d9..3a30cc8b182 100644
--- a/cpp/src/Ice/RequestHandlerFactory.cpp
+++ b/cpp/src/Ice/RequestHandlerFactory.cpp
@@ -61,8 +61,7 @@ IceInternal::RequestHandlerFactory::removeRequestHandler(const ReferencePtr& ref
     {
         Lock sync(*this);
         map<ReferencePtr, RequestHandlerPtr>::iterator p = _handlers.find(ref);
-        assert(p != _handlers.end() && p->second.get() == handler.get());
-        if(p != _handlers.end())
+        if(p != _handlers.end() && p->second.get() == handler.get())
         {
             _handlers.erase(p);
         }