1 files changed, 9 insertions, 0 deletions
diff --git a/cpp/src/Freeze/EvictorI.h b/cpp/src/Freeze/EvictorI.h
index 8995b76da29..ec2792fe541 100644
--- a/cpp/src/Freeze/EvictorI.h
+++ b/cpp/src/Freeze/EvictorI.h
@@ -342,6 +342,15 @@ checkIdentity(const Ice::Identity& ident)
     }
 }
 
+inline void
+checkServant(const Ice::ObjectPtr& servant)
+{
+    if(servant == 0)
+    {
+        throw Ice::IllegalServantException(__FILE__, __LINE__, "cannot add null servant to Freeze Evictor");
+    }
+}
+
 }
 
 #endif