diff --git a/src/bin/build_setting.c b/src/bin/build_setting.c
index 71001c0..c4f4d97 100644
--- a/src/bin/build_setting.c
+++ b/src/bin/build_setting.c
@@ -99,7 +99,7 @@ build_setting_focus_set(build_setting_data *bsd)
 void
 build_setting_config_set(build_setting_data *bsd)
 {
-   EINA_SAFETY_ON_NULL_RETURN(bsd);
+   if (!bsd) return;
 
    config_img_path_set(elm_object_text_get(bsd->img_path_entry));
    config_snd_path_set(elm_object_text_get(bsd->snd_path_entry));
@@ -110,7 +110,7 @@ build_setting_config_set(build_setting_data *bsd)
 void
 build_setting_reset(build_setting_data *bsd)
 {
-   EINA_SAFETY_ON_NULL_RETURN(bsd);
+   if (!bsd) return;
 
    img_path_entry_update(bsd->img_path_entry,
                          (Eina_List *)config_img_path_list_get());
@@ -232,7 +232,7 @@ build_setting_init(void)
 void
 build_setting_term(build_setting_data *bsd)
 {
-   EINA_SAFETY_ON_NULL_RETURN(bsd);
+   if (!bsd) return;
 
    evas_object_del(bsd->layout);
    free(bsd);
diff --git a/src/bin/text_setting.c b/src/bin/text_setting.c
index 201e383..7ef7817 100644
--- a/src/bin/text_setting.c
+++ b/src/bin/text_setting.c
@@ -963,7 +963,7 @@ text_setting_focus_set(text_setting_data *tsd)
 void
 text_setting_config_set(text_setting_data *tsd)
 {
-   EINA_SAFETY_ON_NULL_RETURN(tsd);
+   if (!tsd) return;
 
    config_font_set(tsd->font_name, tsd->font_style);
    config_font_scale_set((float) elm_slider_value_get(tsd->slider_font));
@@ -1004,7 +1004,7 @@ text_setting_init(void)
 void
 text_setting_term(text_setting_data *tsd)
 {
-   EINA_SAFETY_ON_NULL_RETURN(tsd);
+   if (!tsd) return;
 
    evas_object_del(tsd->color_ctxpopup);
    free(tsd->color_keyword_list);