2 files changed, 10 insertions, 0 deletions
diff --git a/java/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java b/java/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java
index 4509e1da798..15496d61798 100644
--- a/java/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java
@@ -57,6 +57,11 @@ public final class AMDServantLocatorI implements ServantLocator
             return new ServantLocator.LocateResult();
         }
 
+        if(current.id.name.equals("invalidReturnValue") || current.id.name.equals("invalidReturnType"))
+        {
+            return new ServantLocator.LocateResult();
+        }
+
         test(current.id.name.equals("locate") || current.id.name.equals("finished"));
         if(current.id.name.equals("locate"))
         {
diff --git a/java/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java b/java/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java
index 8217d99e124..ac488ff2681 100644
--- a/java/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java
@@ -57,6 +57,11 @@ public final class ServantLocatorI implements ServantLocator
             return new ServantLocator.LocateResult();
         }
 
+        if(current.id.name.equals("invalidReturnValue") || current.id.name.equals("invalidReturnType"))
+        {
+            return new ServantLocator.LocateResult();
+        }
+
         test(current.id.name.equals("locate") || current.id.name.equals("finished"));
         if(current.id.name.equals("locate"))
         {