diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 73233aab9a8e..b46ec5be8f90 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-30  Ian Lance Taylor  <ian@airs.com>
+
+	* parse.y (maybe_yank_clinit): Don't crash if bbody is NULL.
+
 2005-03-30  Tom Tromey  <tromey@redhat.com>
 
 	* jcf-dump.c (HANDLE_INNERCLASSES_ATTRIBUTE): Handle cases where
diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 9569f95d0855..741022432000 100644
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -8091,7 +8091,7 @@ maybe_yank_clinit (tree mdecl)
 
   /* Now we analyze the method body and look for something that
      isn't a MODIFY_EXPR */
-  if (!IS_EMPTY_STMT (bbody) && analyze_clinit_body (type, bbody))
+  if (bbody && !IS_EMPTY_STMT (bbody) && analyze_clinit_body (type, bbody))
     return 0;
 
   /* Get rid of <clinit> in the class' list of methods */