1 files changed, 4 insertions, 1 deletions
diff --git a/cpp/src/IcePack/ServerAdapterI.cpp b/cpp/src/IcePack/ServerAdapterI.cpp
index 5121a6881c6..cbf747f5d8a 100644
--- a/cpp/src/IcePack/ServerAdapterI.cpp
+++ b/cpp/src/IcePack/ServerAdapterI.cpp
@@ -99,7 +99,10 @@ IcePack::ServerAdapterI::setDirectProxy(const Ice::ObjectPrx& prx, const Ice::Cu
     // null. We don't allow to overide an existing proxy by another
     // non null proxy.
     //
-    assert(!(prx && _proxy));
+    if(prx && _proxy)
+    {
+	throw AdapterActiveException();
+    }
 
     _proxy = prx;
     _notified = true;