diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c
index c97a001b43..304318d2d8 100644
--- a/legacy/elementary/src/lib/elm_genlist.c
+++ b/legacy/elementary/src/lib/elm_genlist.c
@@ -2685,14 +2685,14 @@ static void
 _elm_genlist_smart_focus_next_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
 {
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
-   *ret = _elm_genlist_smart_focus_next_enable;
+   if (ret) *ret = _elm_genlist_smart_focus_next_enable;
 }
 
 static void
 _elm_genlist_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
 {
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
-   *ret = EINA_FALSE;
+   if (ret) *ret = EINA_FALSE;
 }
 
 static void
@@ -5427,7 +5427,7 @@ _items_count(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    unsigned int *ret = va_arg(*list, unsigned int *);
    Elm_Genlist_Smart_Data *sd = _pd;
 
-   *ret = sd->item_count;
+   if (ret) *ret = sd->item_count;
 }
 
 EAPI Elm_Object_Item *
@@ -5458,7 +5458,7 @@ _item_append(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    const void *func_data = va_arg(*list, const void *);
    Elm_Object_Item **ret = va_arg(*list, Elm_Object_Item **);
    Elm_Genlist_Smart_Data *sd = _pd;
-   *ret = NULL;
+   if (ret) *ret = NULL;
 
    it = _elm_genlist_item_new
        (sd, itc, data, (Elm_Gen_Item *)parent, type, func, func_data);
@@ -5488,7 +5488,7 @@ _item_append(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    it->item->before = EINA_FALSE;
    _item_queue(sd, it, NULL);
 
-   *ret = (Elm_Object_Item *)it;
+   if (ret) *ret = (Elm_Object_Item *)it;
 }
 
 EAPI Elm_Object_Item *
@@ -5519,7 +5519,7 @@ _item_prepend(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    const void *func_data = va_arg(*list, const void *);
    Elm_Object_Item **ret = va_arg(*list, Elm_Object_Item **);
    Elm_Genlist_Smart_Data *sd = _pd;
-   *ret = NULL;
+   if (ret) *ret = NULL;
 
    it = _elm_genlist_item_new
        (sd, itc, data, (Elm_Gen_Item *)parent, type, func, func_data);
@@ -5549,7 +5549,7 @@ _item_prepend(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    it->item->before = EINA_TRUE;
    _item_queue(sd, it, NULL);
 
-   *ret = (Elm_Object_Item *)it;
+   if (ret) *ret = (Elm_Object_Item *)it;
 }
 
 EAPI Elm_Object_Item *
@@ -5583,7 +5583,7 @@ _item_insert_after(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    Elm_Gen_Item *after = (Elm_Gen_Item *)after_it;
    Elm_Gen_Item *it;
 
-   *ret = NULL;
+   if (ret) *ret = NULL;
 
    ELM_GENLIST_ITEM_CHECK(after_it);
    Elm_Genlist_Smart_Data *sd = _pd;
@@ -5615,7 +5615,7 @@ _item_insert_after(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    it->item->before = EINA_FALSE;
    _item_queue(sd, it, NULL);
 
-   *ret = (Elm_Object_Item *)it;
+   if (ret) *ret = (Elm_Object_Item *)it;
 }
 
 EAPI Elm_Object_Item *
@@ -5648,7 +5648,7 @@ _item_insert_before(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    Elm_Gen_Item *before = (Elm_Gen_Item *)before_it;
    Elm_Gen_Item *it;
 
-   *ret = NULL;
+   if (ret) *ret = NULL;
 
    ELM_GENLIST_ITEM_CHECK(before_it);
    Elm_Genlist_Smart_Data *sd = _pd;
@@ -5679,7 +5679,7 @@ _item_insert_before(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    it->item->before = EINA_TRUE;
    _item_queue(sd, it, NULL);
 
-   *ret = (Elm_Object_Item *)it;
+   if (ret) *ret = (Elm_Object_Item *)it;
 }
 
 EAPI Elm_Object_Item *
@@ -5712,7 +5712,7 @@ _item_sorted_insert(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    Evas_Smart_Cb func = va_arg(*list, Evas_Smart_Cb);
    const void *func_data = va_arg(*list, const void *);
    Elm_Object_Item **ret = va_arg(*list, Elm_Object_Item **);
-   *ret = NULL;
+   if (ret) *ret = NULL;
 
    Elm_Genlist_Smart_Data *sd = _pd;
 
@@ -5789,7 +5789,7 @@ _item_sorted_insert(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 
    _item_queue(sd, it, _elm_genlist_item_list_compare);
 
-   *ret = (Elm_Object_Item *)it;
+   if (ret) *ret = (Elm_Object_Item *)it;
 }
 
 EAPI void
@@ -5837,7 +5837,7 @@ _multi_select_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
    Elm_Genlist_Smart_Data *sd = _pd;
 
-   *ret = sd->multi;
+   if (ret) *ret = sd->multi;
 }
 
 EAPI void
@@ -5876,7 +5876,7 @@ _multi_select_mode_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    Elm_Object_Multi_Select_Mode *ret = va_arg(*list, Elm_Object_Multi_Select_Mode *);
    Elm_Genlist_Smart_Data *sd = _pd;
 
-   *ret = sd->multi_select_mode;
+   if (ret) *ret = sd->multi_select_mode;
 }
 
 EAPI Elm_Object_Item *
@@ -5915,7 +5915,7 @@ _selected_items_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    const Eina_List **ret = va_arg(*list, const Eina_List **);
    Elm_Genlist_Smart_Data *sd = _pd;
 
-   *ret = sd->selected;
+   if (ret) *ret = sd->selected;
 }
 
 EAPI Eina_List *
@@ -5935,7 +5935,7 @@ _realized_items_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 
    Eina_List **ret = va_arg(*list, Eina_List **);
    Elm_Genlist_Smart_Data *sd = _pd;
-   *ret = NULL;
+   if (ret) *ret = NULL;
 
    EINA_INLIST_FOREACH(sd->blocks, itb)
      {
@@ -6022,7 +6022,7 @@ _at_xy_item_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
         else *posret = -1;
      }
 
-   *ret = NULL;
+   if (ret) *ret = NULL;
 }
 
 EAPI Elm_Object_Item *
@@ -6041,7 +6041,7 @@ _first_item_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 
    Elm_Object_Item **ret = va_arg(*list, Elm_Object_Item **);
    Elm_Genlist_Smart_Data *sd = _pd;
-   *ret = NULL;
+   if (ret) *ret = NULL;
 
    if (!sd->items) return;
 
@@ -6049,7 +6049,7 @@ _first_item_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    while ((it) && (it->generation < sd->generation))
      it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
 
-   *ret = (Elm_Object_Item *)it;
+   if (ret) *ret = (Elm_Object_Item *)it;
 }
 
 EAPI Elm_Object_Item *
@@ -6067,7 +6067,7 @@ _last_item_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    Elm_Gen_Item *it;
 
    Elm_Object_Item **ret = va_arg(*list, Elm_Object_Item **);
-   *ret = NULL;
+   if (ret) *ret = NULL;
 
    Elm_Genlist_Smart_Data *sd = _pd;
 
@@ -6077,7 +6077,7 @@ _last_item_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    while ((it) && (it->generation < sd->generation))
      it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
 
-   *ret = (Elm_Object_Item *)it;
+   if (ret) *ret = (Elm_Object_Item *)it;
 }
 
 EAPI Elm_Object_Item *
@@ -6828,7 +6828,7 @@ _mode_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    Elm_List_Mode *ret = va_arg(*list, Elm_List_Mode *);
    Elm_Genlist_Smart_Data *sd = _pd;
 
-   *ret = sd->mode;
+   if (ret) *ret = sd->mode;
 }
 
 EAPI void
@@ -6906,7 +6906,7 @@ _homogeneous_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
    Elm_Genlist_Smart_Data *sd = _pd;
 
-   *ret = sd->homogeneous;
+   if (ret) *ret = sd->homogeneous;
 }
 
 EAPI void
@@ -6944,7 +6944,7 @@ _block_count_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    int *ret = va_arg(*list, int *);
    Elm_Genlist_Smart_Data *sd = _pd;
 
-   *ret = sd->max_items_per_block;
+   if (ret) *ret = sd->max_items_per_block;
 }
 
 EAPI void
@@ -6979,7 +6979,7 @@ _longpress_timeout_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    double *ret = va_arg(*list, double *);
    Elm_Genlist_Smart_Data *sd = _pd;
 
-   *ret = sd->longpress_timeout;
+   if (ret) *ret = sd->longpress_timeout;
 }
 
 EAPI void
@@ -7116,7 +7116,7 @@ _decorated_item_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    Elm_Object_Item **ret = va_arg(*list, Elm_Object_Item **);
    Elm_Genlist_Smart_Data *sd = _pd;
 
-   *ret = (Elm_Object_Item *)sd->mode_item;
+   if (ret) *ret = (Elm_Object_Item *)sd->mode_item;
 }
 
 EAPI Eina_Bool
@@ -7134,7 +7134,7 @@ _decorate_mode_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
    Elm_Genlist_Smart_Data *sd = _pd;
 
-   *ret = sd->decorate_all_mode;
+   if (ret) *ret = sd->decorate_all_mode;
 }
 
 EAPI void
@@ -7250,7 +7250,7 @@ _reorder_mode_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
    Elm_Genlist_Smart_Data *sd = _pd;
 
-   *ret = sd->reorder_mode;
+   if (ret) *ret = sd->reorder_mode;
 }
 
 EAPI Elm_Genlist_Item_Type
@@ -7400,7 +7400,7 @@ _select_mode_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    Elm_Object_Select_Mode *ret = va_arg(*list, Elm_Object_Select_Mode *);
    Elm_Genlist_Smart_Data *sd = _pd;
 
-   *ret = sd->select_mode;
+   if (ret) *ret = sd->select_mode;
 }
 
 EAPI void
@@ -7435,7 +7435,7 @@ _highlight_mode_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
    Elm_Genlist_Smart_Data *sd = _pd;
 
-   *ret = sd->highlight;
+   if (ret) *ret = sd->highlight;
 }
 
 EAPI void
@@ -7513,7 +7513,7 @@ _tree_effect_enabled_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
    Elm_Genlist_Smart_Data *sd = _pd;
 
-   *ret = sd->tree_effect_enabled;
+   if (ret) *ret = sd->tree_effect_enabled;
 }
 
 EAPI void
@@ -7546,7 +7546,7 @@ _focus_on_selection_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 {
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
    Elm_Genlist_Smart_Data *sd = _pd;
-   *ret = sd->focus_on_selection_enabled;
+   if (ret) *ret = sd->focus_on_selection_enabled;
 }
 
 EAPI Elm_Object_Item *