diff --git a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousTemplateEditingListener.kt b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousTemplateEditingListener.kt
index cf82dc21af1..f971d8c4243 100644
--- a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousTemplateEditingListener.kt
+++ b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousTemplateEditingListener.kt
@@ -38,8 +38,8 @@ internal class AnonymousTemplateEditingListener(private val psiFile: PsiFile, pr
     private var classRef: KtReferenceExpression? = null
     private var classDescriptor: ClassDescriptor? = null
 
-    override fun currentVariableChanged(templateState: TemplateState?, template: Template?, oldIndex: Int, newIndex: Int) {
-        assert(templateState!!.template != null)
+    override fun currentVariableChanged(templateState: TemplateState, template: Template?, oldIndex: Int, newIndex: Int) {
+        if (templateState.template == null) return
         val variableRange = templateState.getVariableRange("SUPERTYPE") ?: return
         val name = psiFile.findElementAt(variableRange.startOffset)
         if (name != null && name.parent is KtReferenceExpression) {