1 files changed, 7 insertions, 3 deletions
diff --git a/cpp/src/Freeze/EvictorI.cpp b/cpp/src/Freeze/EvictorI.cpp
index 849d152fafb..553ff4e905d 100644
--- a/cpp/src/Freeze/EvictorI.cpp
+++ b/cpp/src/Freeze/EvictorI.cpp
@@ -210,10 +210,14 @@ Freeze::EvictorI::locate(const Current& current, LocalObjectPtr& cookie)
     assert(_db);
 
     //
-    // If this operation is called on a deactivated servant locator,
-    // it's a bug in Ice.
+    // TODO: HACK: It's possible that locate is called on a
+    // deactivated servant locator. There's currently no nice way to
+    // handle this case so we just through an UnknownLocatoException.
     //
-    assert(!_deactivated);
+    if(_deactivated)
+    {
+	throw Ice::UnknownLocalException(__FILE__, __LINE__);
+    }
 
     EvictorElementPtr element;