diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index b227a68f7e7..549a742f398 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-03  Ranjit Mathew  <rmathew@gcc.gnu.org>
+
+	PR java/24127
+	* parse.y (method_header): Make the result of the rule a NULL_TREE
+	when a parsing error occurs.
+
 2005-09-29  Tom Tromey  <tromey@redhat.com>
 
 	PR java/24120:
diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index b728554fb92..555541c4bd4 100644
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -1034,26 +1034,31 @@ method_header:
 |	type error
 		{
 		  yyerror ("Invalid method declaration, method name required");
+		  $$ = NULL_TREE;
 		  RECOVER;
 		}
 |	modifiers type error
 		{
 		  yyerror ("Identifier expected");
+		  $$ = NULL_TREE;
 		  RECOVER;
 		}
 |	VOID_TK error
 		{
 		  yyerror ("Identifier expected");
+		  $$ = NULL_TREE;
 		  RECOVER;
 		}
 |	modifiers VOID_TK error
 		{
 		  yyerror ("Identifier expected");
+		  $$ = NULL_TREE;
 		  RECOVER;
 		}
 |	modifiers error
 		{
 		  yyerror ("Invalid method declaration, return type required");
+		  $$ = NULL_TREE;
 		  RECOVER;
 		}
 ;