From 8ef14714ca1251ed7282d9d7639460e402ccf0ef Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 13 Sep 2012 19:15:58 +0400
Subject: [PATCH] EA-38987 - NPE: GenerateMembersHandlerBase.chooseMembers

---
 .../generation/GenerateMembersHandlerBase.java           | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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;
+            }
           }
         }
       }