diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddConstModifierFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddConstModifierFix.kt
index d70a4ce877b..594c41d4afa 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddConstModifierFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddConstModifierFix.kt
@@ -39,13 +39,17 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtAnnotationEntry
 import org.jetbrains.kotlin.psi.KtProperty
 import org.jetbrains.kotlin.psi.KtReferenceExpression
+import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer
 import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
 import org.jetbrains.kotlin.psi.psiUtil.hasActualModifier
 import org.jetbrains.kotlin.resolve.checkers.ConstModifierChecker
 import org.jetbrains.kotlin.resolve.source.PsiSourceElement
 
-class AddConstModifierFix(val property: KtProperty) : AddModifierFix(property, KtTokens.CONST_KEYWORD), CleanupFix {
+class AddConstModifierFix(property: KtProperty) : AddModifierFix(property, KtTokens.CONST_KEYWORD), CleanupFix {
+    private val pointer = property.createSmartPointer()
+
     override fun invokeImpl(project: Project, editor: Editor?, file: PsiFile) {
+        val property = pointer.element ?: return
         addConstModifier(property)
     }