diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/Normal17CompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/Normal17CompletionTest.groovy
index 376c011939b2..63eaaa22dc22 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/Normal17CompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/Normal17CompletionTest.groovy
@@ -17,6 +17,7 @@ package com.intellij.codeInsight.completion
 
 import com.intellij.JavaTestUtil
 import com.intellij.testFramework.LightProjectDescriptor
+import org.jetbrains.annotations.NotNull
 
 public class Normal17CompletionTest extends LightFixtureCompletionTestCase {
   @Override
@@ -24,6 +25,7 @@ public class Normal17CompletionTest extends LightFixtureCompletionTestCase {
     return JavaTestUtil.getRelativeJavaTestDataPath() + "/codeInsight/completion/normal/";
   }
 
+  @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
     return JAVA_LATEST
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 a0b7120784c7..f95899dbf184 100644
--- a/platform/lang-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
+++ b/platform/lang-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
@@ -930,7 +930,8 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
     }
 
     public void nodeReplaced(@NotNull final ASTNode oldChild, @NotNull final LighterASTNode newChild) {
-      myDelegate.nodeReplaced(oldChild, myConverter.convert((Node)newChild));
+      ASTNode converted = myConverter.convert((Node)newChild);
+      myDelegate.nodeReplaced(oldChild, converted);
     }
   }