diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index c9336d341e9..5b1e588cd61 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-15  Evgeny Stupachenko  <evstupac@gmail.com>
+
+	PR target/63536	
+	* lang.c (java_print_error_function): Add check on NULL function
+	context.
+
 2014-10-12  Trevor Saunders  <tsaunders@mozilla.com>
 
 	* class.c, decl.c, except.c, expr.c, java-tree.h, lang.c: Use
diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index 7f0b09de392..b64e4eaba06 100644
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -489,6 +489,7 @@ java_print_error_function (diagnostic_context *context ATTRIBUTE_UNUSED,
     return;
 
   if (current_function_decl != NULL
+      && DECL_CONTEXT (current_function_decl) != NULL
       && DECL_CONTEXT (current_function_decl) != last_error_function_context)
     {
       if (file)