2 files changed, 8 insertions, 24 deletions
diff --git a/java/demo/Ice/value/Client.java b/java/demo/Ice/value/Client.java
index 9058936804f..6ae04119498 100644
--- a/java/demo/Ice/value/Client.java
+++ b/java/demo/Ice/value/Client.java
@@ -203,20 +203,12 @@ public class Client
         {
             ex.printStackTrace();
             status = 1;
-        }
-
-        if(communicator != null)
-        {
-            try
-            {
+        } finally {
+	    if(communicator != null)
+	    {
                 communicator.destroy();
             }
-            catch(Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                status = 1;
-            }
-        }
+	}
 
         System.exit(status);
     }
diff --git a/java/demo/Ice/value/Server.java b/java/demo/Ice/value/Server.java
index f49a9cb1731..e841207b1d8 100644
--- a/java/demo/Ice/value/Server.java
+++ b/java/demo/Ice/value/Server.java
@@ -42,20 +42,12 @@ public class Server
         {
             ex.printStackTrace();
             status = 1;
-        }
-
-        if(communicator != null)
-        {
-            try
-            {
+        } finally {
+	    if(communicator != null)
+	    {
                 communicator.destroy();
             }
-            catch(Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                status = 1;
-            }
-        }
+	}
 
         System.exit(status);
     }