diff --git a/idea/src/org/jetbrains/jet/plugin/annotations/JetPsiChecker.java b/idea/src/org/jetbrains/jet/plugin/annotations/JetPsiChecker.java
index 85c004ef2de..95962f451d8 100644
--- a/idea/src/org/jetbrains/jet/plugin/annotations/JetPsiChecker.java
+++ b/idea/src/org/jetbrains/jet/plugin/annotations/JetPsiChecker.java
@@ -136,7 +136,10 @@ public class JetPsiChecker implements Annotator {
                     @Override
                     public void visitProperty(JetProperty property) {
                         DeclarationDescriptor declarationDescriptor = bindingContext.get(DECLARATION_TO_DESCRIPTOR, property);
-                        markVariableAsWrappedIfNeeded(property.getNameIdentifier().getNode(), declarationDescriptor);
+                        PsiElement nameIdentifier = property.getNameIdentifier();
+                        if (nameIdentifier != null) {
+                            markVariableAsWrappedIfNeeded(nameIdentifier.getNode(), declarationDescriptor);
+                        }
                         super.visitProperty(property);
                     }