diff --git a/platform/lang-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java b/platform/lang-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
index bdd6b274da49..64bcae71ece0 100644
--- a/platform/lang-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
+++ b/platform/lang-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
@@ -476,6 +476,8 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
   }
 
   public void advanceLexer() {
+    if (eof()) return;
+
     if (!myTokenTypeChecked) {
       LOG.assertTrue(eof(), "Probably a bug: eating token without its type checking");
     }