diff --git a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java index a5ffe21786be..a4c5aa45b129 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java @@ -179,8 +179,11 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase impleme final Component rendererComponent = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); final StringBuffer buf = new StringBuffer(); - ((PsiExpression)value).accept(new PsiExpressionTrimRenderer(buf)); - setText(buf.toString()); + final PsiExpression expr = (PsiExpression)value; + if (expr.isValid()) { + expr.accept(new PsiExpressionTrimRenderer(buf)); + setText(buf.toString()); + } return rendererComponent; } });