1 files changed, 3 insertions, 2 deletions
diff --git a/libjava/java/awt/Toolkit.java b/libjava/java/awt/Toolkit.java
index 36615944a20..6fd1413895b 100644
--- a/libjava/java/awt/Toolkit.java
+++ b/libjava/java/awt/Toolkit.java
@@ -496,9 +496,10 @@ public abstract class Toolkit
         toolkit = (Toolkit) obj;
         return toolkit;
       }
-    catch (Exception e)
+    catch (Throwable t)
       {
-        throw new AWTError("Cannot load AWT toolkit: " + e.getMessage());
+	AWTError e = new AWTError("Cannot load AWT toolkit: " + toolkit_name);
+	throw (AWTError) e.initCause(t);
       }
   }