diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/AddValVarToConstructorParameterAction.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/AddValVarToConstructorParameterAction.kt
index 6ec22e4632f..0e2793a25ff 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/AddValVarToConstructorParameterAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/AddValVarToConstructorParameterAction.kt
@@ -59,9 +59,9 @@ interface AddValVarToConstructorParameterAction {
         editor.caretModel.moveToOffset(parameter.startOffset)
 
         TemplateBuilderImpl(parameter)
-                .apply { replaceElement(parameter.valOrVarKeyword!!, ValVarExpression) }
-                .buildInlineTemplate()
-                .let { TemplateManager.getInstance(project).startTemplate(editor, it) }
+            .apply { replaceElement(parameter.valOrVarKeyword ?: return@apply, ValVarExpression) }
+            .buildInlineTemplate()
+            .let { TemplateManager.getInstance(project).startTemplate(editor, it) }
     }
 
     class Intention :