1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index 31329f20b5b..c5b41c01226 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -457,7 +457,11 @@ Ice::ObjectAdapterI::incUsageCount()
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
  
-    assert(_instance); // Must not be called after deactivation.
+    if(!_instance)
+    {
+	throw ObjectAdapterDeactivatedException(__FILE__, __LINE__);
+    }
+
     assert(_usageCount >= 0);
     ++_usageCount;
 }