From 57d81d61e59d9accf983f0786fd9e0fe041bc3aa Mon Sep 17 00:00:00 2001
From: "Ilya.Kazakevich" <Ilya.Kazakevich@jetbrains.com>
Date: Fri, 1 Jul 2016 01:18:09 +0300
Subject: [PATCH] PY-19136: Returning null leads to NPE because #ensureValid is
 @NotNull

---
 .../com/intellij/refactoring/classMembers/MemberInfoBase.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/lang-api/src/com/intellij/refactoring/classMembers/MemberInfoBase.java b/platform/lang-api/src/com/intellij/refactoring/classMembers/MemberInfoBase.java
index 0da9d6148dbc..99b34c300396 100644
--- a/platform/lang-api/src/com/intellij/refactoring/classMembers/MemberInfoBase.java
+++ b/platform/lang-api/src/com/intellij/refactoring/classMembers/MemberInfoBase.java
@@ -70,7 +70,9 @@ public abstract class MemberInfoBase<T extends PsiElement> {
 
   public T getMember() {
     T element = myMember.getElement();
-    PsiUtilCore.ensureValid(element);
+    if (element != null) {
+      PsiUtilCore.ensureValid(element);
+    }
     return element;
   }