diff --git a/java/java-impl/src/com/intellij/lang/java/parser/FileParser.java b/java/java-impl/src/com/intellij/lang/java/parser/FileParser.java
index c29ffef181ad..8bdacf5384b3 100644
--- a/java/java-impl/src/com/intellij/lang/java/parser/FileParser.java
+++ b/java/java-impl/src/com/intellij/lang/java/parser/FileParser.java
@@ -52,10 +52,10 @@ public class FileParser {
         continue;
       }
 
-      final PsiBuilder.Marker decl = DeclarationParser.parse(builder, DeclarationParser.Context.FILE);
-      if (decl != null) {
+      final PsiBuilder.Marker declaration = DeclarationParser.parse(builder, DeclarationParser.Context.FILE);
+      if (declaration != null) {
         if (invalidElements != null) {
-          invalidElements.errorBefore(JavaErrorMessages.message("expected.class.or.interface"), decl);
+          invalidElements.errorBefore(JavaErrorMessages.message("expected.class.or.interface"), declaration);
           invalidElements = null;
         }
         continue;
diff --git a/java/java-impl/src/com/intellij/lang/java/parser/JavaParser.java b/java/java-impl/src/com/intellij/lang/java/parser/JavaParser.java
index 9d1e8a49cea7..dbe1ab0f5121 100644
--- a/java/java-impl/src/com/intellij/lang/java/parser/JavaParser.java
+++ b/java/java-impl/src/com/intellij/lang/java/parser/JavaParser.java
@@ -34,12 +34,12 @@ public class JavaParser implements PsiParser {
 
   @NotNull
   public ASTNode parse(final IElementType rootType, final PsiBuilder builder) {
-    final PsiBuilder.Marker root = builder.mark();
     setLanguageLevel(builder, myLanguageLevel);
 
+    final PsiBuilder.Marker root = builder.mark();
     FileParser.parse(builder);
-
     root.done(rootType);
+
     return builder.getTreeBuilt();
   }
 }