1 files changed, 5 insertions, 1 deletions
diff --git a/py/python/Ice.py b/py/python/Ice.py
index 1682b85b302..2ae870965dc 100644
--- a/py/python/Ice.py
+++ b/py/python/Ice.py
@@ -302,7 +302,11 @@ class CommunicatorI(Communicator):
         return self._impl.getDefaultContext()
 
     def getImplicitContext(self):
-        return ImplicitContextI(self._impl.getImplicitContext())
+        context = self._impl.getImplicitContext()
+        if context == None:
+            return None;
+        else:
+            return ImplicitContextI(context)
 
     def getProperties(self):
         properties = self._impl.getProperties()