diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java
index 0a997274b0f..3b9d0479f45 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java
@@ -78,7 +78,8 @@ abstract class JetNamedDeclarationStub<T extends KotlinStubWithFqName<?>> extend
 
     @Override
     public PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperationException {
-        return getNameIdentifier().replace(JetPsiFactory(this).createNameIdentifier(name));
+        PsiElement identifier = getNameIdentifier();
+        return identifier != null ? identifier.replace(JetPsiFactory(this).createNameIdentifier(name)) : null;
     }
 
     @Override