1 files changed, 20 insertions, 1 deletions
diff --git a/libjava/java/lang/FirstThread.java b/libjava/java/lang/FirstThread.java
index ec0f1db33d5..0dd5c9c67ad 100644
--- a/libjava/java/lang/FirstThread.java
+++ b/libjava/java/lang/FirstThread.java
@@ -19,12 +19,30 @@ package java.lang;
 
 final class FirstThread extends Thread
 {
-  public native void run ();
+  public native void run0 ();
+  public void run () 
+  {
+    try {
+      run0 ();
+    } catch (Throwable ex) {
+      System.err.println ("uncaught exception at top level");
+      ex.printStackTrace ();
+    }
+  }
 
   public FirstThread (ThreadGroup g, Class k, Object o)
   {
     super (g, null, "main");
     klass = k;
+    klass_name = null;
+    args = o;
+  }
+
+  public FirstThread (ThreadGroup g, String class_name, Object o)
+  {
+    super (g, null, "main");
+    klass = null;
+    klass_name = class_name;
     args = o;
   }
 
@@ -36,5 +54,6 @@ final class FirstThread extends Thread
 
   // Private data.
   private Class klass;
+  private String klass_name;
   private Object args;
 }