diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/IntroduceVariableIntentionAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/IntroduceVariableIntentionAction.java index e45643fa52fb..e605591405f8 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/IntroduceVariableIntentionAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/IntroduceVariableIntentionAction.java @@ -54,7 +54,8 @@ public class IntroduceVariableIntentionAction extends BaseRefactoringIntentionAc final PsiExpression expression = statement.getExpression(); - return !PsiType.VOID.equals(expression.getType()) && !(expression instanceof PsiAssignmentExpression); + final PsiType expressionType = expression.getType(); + return expressionType != null && !PsiType.VOID.equals(expressionType) && !(expression instanceof PsiAssignmentExpression); } @Override