diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/PyClassMembersProviderBase.java b/python/psi-api/src/com/jetbrains/python/psi/types/PyClassMembersProviderBase.java
index 3eb2ef1e11b3..664a707ff164 100644
--- a/python/psi-api/src/com/jetbrains/python/psi/types/PyClassMembersProviderBase.java
+++ b/python/psi-api/src/com/jetbrains/python/psi/types/PyClassMembersProviderBase.java
@@ -22,6 +22,9 @@ public class PyClassMembersProviderBase implements PyClassMembersProvider {
   @Override
   public PsiElement resolveMember(PyClassType clazz, String name, PsiElement location) {
     final Collection<PyDynamicMember> members = getMembers(clazz, location);
+    if (members == null) {
+      return null;
+    }
     return resolveMemberByName(members, clazz, name);
   }