Index: src/lib/eina_list.c
===================================================================
--- src/lib/eina_list.c	(revision 75717)
+++ src/lib/eina_list.c	(working copy)
@@ -1034,11 +1034,11 @@ eina_list_sort(Eina_List *list, unsigned int limit
    Eina_List *unsort = NULL;
    Eina_List *stack[EINA_LIST_SORT_STACK_SIZE];
 
-   EINA_SAFETY_ON_NULL_RETURN_VAL(func, list);
-   if (!list)
-     return NULL;
+   EINA_SAFETY_ON_NULL_RETURN_VAL(list, NULL);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(func, NULL);
 
    EINA_MAGIC_CHECK_LIST(list, NULL);
+   
 
    /* if the caller specified an invalid limit, sort the whole list */
    if ((limit == 0) ||
@@ -1466,6 +1466,8 @@ eina_list_accessor_new(const Eina_List *list)
 {
    Eina_Accessor_List *ac;
 
+   EINA_SAFETY_ON_NULL_RETURN_VAL(list, NULL);
+
    eina_error_set(0);
    ac = calloc(1, sizeof (Eina_Accessor_List));
    if (!ac)