diff --git a/src/bin/e_randr.c b/src/bin/e_randr.c
index 21d215c1e..3787243c1 100644
--- a/src/bin/e_randr.c
+++ b/src/bin/e_randr.c
@@ -99,9 +99,9 @@ _screen_info_refresh(void)
    Ecore_X_Window root;
    int n;
 
-   EINA_SAFETY_ON_FALSE_RETURN(ecore_x_randr_query());
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(ecore_x_randr_query(), EINA_FALSE);
 
-   if (!(roots = ecore_x_window_root_list(&n))) return;
+   if (!(roots = ecore_x_window_root_list(&n))) return EINA_FALSE;
    /* first (and only) root window */
    root = roots[0];
    free(roots);
diff --git a/src/bin/e_randr_11.c b/src/bin/e_randr_11.c
index 0e9b4b8cd..3f9fcafab 100644
--- a/src/bin/e_randr_11.c
+++ b/src/bin/e_randr_11.c
@@ -96,8 +96,10 @@ _11_screen_info_free(E_Randr_Screen_Info_11 *screen_info)
 Eina_Bool
 _11_screen_info_refresh(void)
 {
-   EINA_SAFETY_ON_TRUE_RETURN(E_RANDR_11_NO);
+   EINA_SAFETY_ON_TRUE_RETURN_VAL(E_RANDR_11_NO, EINA_FALSE);
 
    _11_screen_info_free(e_randr_screen_info.rrvd_info.randr_info_11);
-   return ((e_randr_screen_info.rrvd_info.randr_info_11 = _11_screen_info_new()));
+   e_randr_screen_info.rrvd_info.randr_info_11 = _11_screen_info_new();
+
+   return (e_randr_screen_info.rrvd_info.randr_info_11 != NULL);
 }
diff --git a/src/bin/e_randr_12.c b/src/bin/e_randr_12.c
index 75b33c403..07c653c79 100644
--- a/src/bin/e_randr_12.c
+++ b/src/bin/e_randr_12.c
@@ -303,7 +303,7 @@ _mode_geo_identical_find(Eina_List *modes, Ecore_X_Randr_Mode_Info *mode)
    Eina_Bool
 _12_screen_info_refresh(void)
 {
-   EINA_SAFETY_ON_TRUE_RETURN(e_randr_screen_info.randr_version < ECORE_X_RANDR_1_2);
+   EINA_SAFETY_ON_TRUE_RETURN_VAL((e_randr_screen_info.randr_version < ECORE_X_RANDR_1_2), EINA_FALSE);
 
    if (e_randr_screen_info.rrvd_info.randr_info_12)
      _12_screen_info_free(e_randr_screen_info.rrvd_info.randr_info_12);
@@ -312,6 +312,8 @@ _12_screen_info_refresh(void)
      return EINA_FALSE;
 
    _screen_primary_output_assign(NULL);
+
+   return EINA_TRUE;
 }
 
 /******************************************************************