diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 072d5ef1046..737d83a93e6 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-24  Jeff Sturm  <jsturm@sigma6.com>
+
+	* gnu/gcj/runtime/natFirstThread.cc (run): Initialize class before
+	calling main.
+
 2000-04-22  Anthony Green  <green@cygnus.com>
 
 	* include/jvm.h (__builtin_expect): Define as unused for now.
diff --git a/libjava/gnu/gcj/runtime/natFirstThread.cc b/libjava/gnu/gcj/runtime/natFirstThread.cc
index c498ff84d78..3b36d392e10 100644
--- a/libjava/gnu/gcj/runtime/natFirstThread.cc
+++ b/libjava/gnu/gcj/runtime/natFirstThread.cc
@@ -74,10 +74,9 @@ gnu::gcj::runtime::FirstThread::run (void)
     }
 
   if (klass == NULL)
-    {
-      klass = java::lang::Class::forName (klass_name);
-      if (klass != NULL) _Jv_InitClass (klass);
-    }
+    klass = java::lang::Class::forName (klass_name);
+  if (klass != NULL)
+    _Jv_InitClass (klass);
 
   _Jv_Method *meth = _Jv_GetMethodLocal (klass, main_name, main_signature);