diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java index e8521d613eac..3c28e2dd11fb 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java @@ -639,6 +639,9 @@ public class IntroduceParameterHandler extends IntroduceHandlerBase { final PsiType selectedType, final ExtractMethodProcessor processor, final PsiElement[] elements) { + if (!elements[0].isValid()) { + return; + } final PsiElement commonParent = findCommonParent(elements); if (commonParent == null) { LOG.error("Should have common parent:" + Arrays.toString(elements)); diff --git a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceFunctionalVariableHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceFunctionalVariableHandler.java index afec6600bc22..0a413cd0098e 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceFunctionalVariableHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceFunctionalVariableHandler.java @@ -115,6 +115,7 @@ public class IntroduceFunctionalVariableHandler extends IntroduceVariableHandler Editor editor, MyExtractMethodProcessor processor, PsiElement[] elements) { + if (!elements[0].isValid()) return; if (!CommonRefactoringUtil.checkReadOnlyStatus(project, elements[0])) return; MyExtractMethodProcessor physicalProcessor = new MyExtractMethodProcessor(project, editor, elements,