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