diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/TypeRefHelpers.kt b/compiler/frontend/src/org/jetbrains/jet/lang/psi/TypeRefHelpers.kt
index 1a1a282c5d1..db11513e8c3 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/TypeRefHelpers.kt
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/TypeRefHelpers.kt
@@ -24,6 +24,7 @@ import com.intellij.psi.PsiElement
 import org.jetbrains.jet.lang.psi.JetPsiFactory
 import com.intellij.psi.PsiWhiteSpace
 import org.jetbrains.jet.lang.psi.JetNamedDeclaration
+import com.intellij.psi.PsiErrorElement
 
 fun getTypeRef(declaration: JetDeclaration): JetTypeReference? {
     return declaration.getFirstChild()!!.siblings(forward = true)
@@ -39,7 +40,7 @@ fun setTypeRef(declaration: JetNamedDeclaration, addAfter: PsiElement?, typeRef:
             return oldTypeRef.replace(typeRef) as JetTypeReference
         }
         else {
-            var anchor = addAfter ?: declaration.getNameIdentifier()
+            var anchor = addAfter ?: declaration.getNameIdentifier()?.siblings(forward = true)?.firstOrNull { it is PsiErrorElement }
             val newTypeRef = declaration.addAfter(typeRef, anchor) as JetTypeReference
             declaration.addAfter(JetPsiFactory(declaration.getProject()).createColon(), anchor)
             return newTypeRef