diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java index b34ef1d6172e..18a203b7ca82 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java @@ -593,7 +593,7 @@ public abstract class InplaceRefactoring { final int offset) { if (nameIdentifier != null) { final TextRange range = nameIdentifier.getTextRange(); - if (contains(range, offset)) return nameIdentifier; + if (range != null && contains(range, offset)) return nameIdentifier; } for (PsiReference ref : refs) {