1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/Ice/src/main/java/IceInternal/IncomingBase.java b/java/src/Ice/src/main/java/IceInternal/IncomingBase.java
index 5a537ccb248..0ce16f152ec 100644
--- a/java/src/Ice/src/main/java/IceInternal/IncomingBase.java
+++ b/java/src/Ice/src/main/java/IceInternal/IncomingBase.java
@@ -325,12 +325,12 @@ class IncomingBase
         }
         catch(Ice.RequestFailedException ex)
         {
-            if(ex.id == null)
+            if(ex.id == null || ex.id.name == null || ex.id.name.isEmpty())
             {
                 ex.id = _current.id;
             }
 
-            if(ex.facet == null)
+            if(ex.facet == null || ex.facet.isEmpty())
             {
                 ex.facet = _current.facet;
             }