diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java index 7c535b8c8c9f..d2846a717dca 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java @@ -192,9 +192,12 @@ public abstract class GenerateMembersHandlerBase implements CodeInsightActionHan for (ClassMember member : members) { if (member instanceof PsiElementClassMember) { final PsiDocCommentOwner owner = ((PsiElementClassMember)member).getElement(); - if (owner != null && owner.getTextRange().contains(offset)) { - preselection = member; - break; + if (owner != null) { + final TextRange textRange = owner.getTextRange(); + if (textRange != null && textRange.contains(offset)) { + preselection = member; + break; + } } } }