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