diff --git a/python/helpers/pycharm_generator_utils/module_redeclarator.py b/python/helpers/pycharm_generator_utils/module_redeclarator.py
index a79a91ed4dd3..fd34c3ad7c37 100644
--- a/python/helpers/pycharm_generator_utils/module_redeclarator.py
+++ b/python/helpers/pycharm_generator_utils/module_redeclarator.py
@@ -684,7 +684,9 @@ class ModuleRedeclarator(object):
                 try:
                     item = getattr(p_class, item_name) # let getters do the magic
                 except AttributeError:
-                    item = field_source[item_name] # have it raw
+                    item = field_source.get(item_name) # have it raw
+                    if item is None:
+                        continue
                 except Exception:
                     continue
             if is_callable(item) and not isinstance(item, type):