From ee8c96ddeeb41d804fb74d0d923359d5873e8f80 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <abreslav@abreslav-mac.labs.intellij.net>
Date: Mon, 14 Nov 2011 20:10:25 +0300
Subject: [PATCH] NPE fixed

---
 .../types/expressions/BasicExpressionTypingVisitor.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
index 9078280b43d..0446105d479 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
@@ -861,7 +861,11 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
 
     @Override
     public JetType visitAnnotatedExpression(JetAnnotatedExpression expression, ExpressionTypingContext data) {
-        return facade.getType(expression.getBaseExpression(), data);
+        JetExpression baseExpression = expression.getBaseExpression();
+        if (baseExpression == null) {
+            return null;
+        }
+        return facade.getType(baseExpression, data);
     }
 
     @Override