diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorMatchingSuperFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorMatchingSuperFix.java
index 0a33347490cd..c512bd51934f 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorMatchingSuperFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorMatchingSuperFix.java
@@ -126,7 +126,9 @@ public class CreateConstructorMatchingSuperFix extends BaseIntentionAction {
                 }
               }
 
-              derived.getNameIdentifier().replace(targetClass.getNameIdentifier());
+              final PsiIdentifier identifier = targetClass.getNameIdentifier();
+              LOG.assertTrue(identifier != null, targetClass);
+              derived.getNameIdentifier().replace(identifier);
               @NonNls StringBuffer buffer = new StringBuffer();
               buffer.append("void foo () {\nsuper(");