1 files changed, 9 insertions, 0 deletions
diff --git a/java/src/Ice/Application.java b/java/src/Ice/Application.java
index ba7e0d4980b..6735596e912 100644
--- a/java/src/Ice/Application.java
+++ b/java/src/Ice/Application.java
@@ -125,6 +125,15 @@ public abstract class Application
             ex.printStackTrace();
             status = 1;
         }
+	catch(java.lang.Error err)
+	{
+	    //
+	    // We catch Error to avoid hangs in some non-fatal situations
+	    //
+	    System.err.println(_appName + ": Java error");
+            err.printStackTrace();
+            status = 1;
+	}
 
 	defaultInterrupt();