diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index 428e9d70b96..2a742509635 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -268,9 +268,9 @@ static int ctx_data_get(bContext *C, const char *member, bContextDataResult *res
 	memset(result, 0, sizeof(bContextDataResult));
 #ifdef WITH_PYTHON
 	if (CTX_py_dict_get(C)) {
-		return BPY_context_member_get(C, member, result);
-//		if (BPY_context_member_get(C, member, result))
-//			return 1;
+		if (BPY_context_member_get(C, member, result)) {
+			return 1;
+		}
 	}
 #endif
 
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index c39168779fd..79f856344d3 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -777,7 +777,7 @@ int BPY_context_member_get(bContext *C, const char *member, bContextDataResult *
 		/* pass */
 	}
 	else if (item == Py_None) {
-		/* pass */
+		done = true;
 	}
 	else if (BPy_StructRNA_Check(item)) {
 		ptr = &(((BPy_StructRNA *)item)->ptr);