From 9d7d6beb5e15ce744aaaaaff43004dba57c149cb Mon Sep 17 00:00:00 2001
From: Andrey Vlasovskikh <andrey.vlasovskikh@gmail.com>
Date: Wed, 15 Aug 2012 20:21:55 +0400
Subject: [PATCH] Fixed NPE in PyDynamicMember

---
 .../com/jetbrains/python/codeInsight/PyDynamicMember.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python/psi-api/src/com/jetbrains/python/codeInsight/PyDynamicMember.java b/python/psi-api/src/com/jetbrains/python/codeInsight/PyDynamicMember.java
index 866b83a3a210..a7a87892fe77 100644
--- a/python/psi-api/src/com/jetbrains/python/codeInsight/PyDynamicMember.java
+++ b/python/psi-api/src/com/jetbrains/python/codeInsight/PyDynamicMember.java
@@ -181,7 +181,10 @@ public class PyDynamicMember {
       if (myTypeCallback != null) {
         return myTypeCallback.fun(myContext);
       }
-      return PyPsiFacade.getInstance(getProject()).createClassType(myClass, !myResolveToInstance);
+      else if (myClass != null) {
+        return PyPsiFacade.getInstance(getProject()).createClassType(myClass, !myResolveToInstance);
+      }
+      return null;
     }
   }
 }