diff --git a/src/bin/e_randr_12_output.c b/src/bin/e_randr_12_output.c
index 105f90cb6..92332802b 100644
--- a/src/bin/e_randr_12_output.c
+++ b/src/bin/e_randr_12_output.c
@@ -228,8 +228,8 @@ _modes_size_sort_cb(const void *d1, const void *d2)
 {
    Ecore_X_Randr_Mode_Info *mode1 = ((Ecore_X_Randr_Mode_Info *)d1), *mode2 = ((Ecore_X_Randr_Mode_Info *)d2);
 
-   EINA_SAFETY_ON_NULL_RETURN_VAL(d1, 1);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(d2, -1);
+   if (!d1) return 1;
+   if (!d2) return -1;
 
    return (mode1->width * mode1->height) - (mode2->width * mode2->height);
 }
diff --git a/src/bin/e_randr_12_serialization.c b/src/bin/e_randr_12_serialization.c
index 83a0c3420..9679eee9d 100644
--- a/src/bin/e_randr_12_serialization.c
+++ b/src/bin/e_randr_12_serialization.c
@@ -583,7 +583,7 @@ static int
 _sort_by_number_of_edids(const void *d1, const void *d2)
 {
     const E_Randr_Serialized_Setup_12 *ss1 = (const E_Randr_Serialized_Setup_12*)d1;
-    const E_Randr_Serialized_Setup_12 *ss2 = (const E_Randr_Serialized_Setup_12*)d1;
+    const E_Randr_Serialized_Setup_12 *ss2 = (const E_Randr_Serialized_Setup_12*)d2;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(ss1, 1);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ss2, -1);