diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index c062833188..546b5d3999 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -362,6 +362,8 @@ _key_generic_set(const Eo *obj, Efl_Object_Data *pd, const char *key, const void
                }
           }
      }
+   else
+     if (!data) return NULL;
 
    ext = _efl_object_extension_need(pd);
    if (ext)