1 files changed, 13 insertions, 5 deletions
diff --git a/java/demo/Ice/hello/Client.java b/java/demo/Ice/hello/Client.java
index c48c8982d34..6e77b1a3d38 100644
--- a/java/demo/Ice/hello/Client.java
+++ b/java/demo/Ice/hello/Client.java
@@ -165,12 +165,20 @@ public class Client
         {
             ex.printStackTrace();
             status = 1;
-        } finally {
-	    if(communicator != null)
-	    {
+        }
+
+        if(communicator != null)
+        {
+            try
+            {
                 communicator.destroy();
-	    }
-	}
+            }
+            catch(Ice.LocalException ex)
+            {
+                ex.printStackTrace();
+                status = 1;
+            }
+        }
 
         System.exit(status);
     }