diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/BasePlatformRefactoringAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/BasePlatformRefactoringAction.java index 270f593d6c0f..551bf1d825bd 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/actions/BasePlatformRefactoringAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/actions/BasePlatformRefactoringAction.java @@ -74,7 +74,10 @@ public abstract class BasePlatformRefactoringAction extends BaseRefactoringActio if (editor != null && file != null) { element = getElementAtCaret(editor, file); if (element != null) { - return getHandler(element.getLanguage(), element); + RefactoringActionHandler handler = getHandler(element.getLanguage(), element); + if (handler != null) { + return handler; + } } }