1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/IceInternal/ObjectAdapterFactory.java b/java/src/IceInternal/ObjectAdapterFactory.java
index a5bc4dab828..4b9d03074b0 100644
--- a/java/src/IceInternal/ObjectAdapterFactory.java
+++ b/java/src/IceInternal/ObjectAdapterFactory.java
@@ -107,7 +107,7 @@ public final class ObjectAdapterFactory
     {
 	if(_instance == null)
 	{
-	    throw new Ice.CommunicatorDestroyedException();
+	    throw new Ice.ObjectAdapterDeactivatedException();
 	}
 
         Ice.ObjectAdapter adapter = (Ice.ObjectAdapter)_adapters.get(name);
@@ -126,7 +126,7 @@ public final class ObjectAdapterFactory
     {
 	if(_instance == null)
 	{
-	    throw new Ice.CommunicatorDestroyedException();
+	    return null;
 	}
 
         java.util.Iterator i = _adapters.values().iterator();