diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java
index aee12447b5e..e8d171a065f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java
@@ -57,6 +57,10 @@ public class JetAnnotationEntry extends JetElementImplStub<PsiJetAnnotationEntry
 
     @Override
     public JetValueArgumentList getValueArgumentList() {
+        PsiJetAnnotationEntryStub stub = getStub();
+        if (stub != null && !stub.hasValueArguments()) {
+            return null;
+        }
         return (JetValueArgumentList) findChildByType(JetNodeTypes.VALUE_ARGUMENT_LIST);
     }