diff --git a/src/bin/entrance_gui.c b/src/bin/entrance_gui.c
index 3787ed9..fd55745 100644
--- a/src/bin/entrance_gui.c
+++ b/src/bin/entrance_gui.c
@@ -459,21 +459,28 @@ void
 entrance_gui_conf_set(const Entrance_Conf_Gui_Event *conf)
 {
    Entrance_Image *img;
-   EINA_LIST_FREE(_gui->background_pool, img)
-     {
-        eina_stringshare_del(img->path);
-        eina_stringshare_del(img->group);
-        free(img);
-      }
-   _gui->background_pool = conf->background_pool;
 
-   EINA_LIST_FREE(_gui->icon_pool, img)
+   if (conf->background_pool)
      {
-        eina_stringshare_del(img->path);
-        eina_stringshare_del(img->group);
-        free(img);
+        EINA_LIST_FREE(_gui->background_pool, img)
+          {
+             eina_stringshare_del(img->path);
+             eina_stringshare_del(img->group);
+             free(img);
+          }
+        _gui->background_pool = conf->background_pool;
+     }
+
+   if (conf->icon_pool)
+     {
+        EINA_LIST_FREE(_gui->icon_pool, img)
+          {
+             eina_stringshare_del(img->path);
+             eina_stringshare_del(img->group);
+             free(img);
+          }
+        _gui->icon_pool = conf->icon_pool;
      }
-   _gui->icon_pool = conf->icon_pool;
 
    if (_gui->bg.path != conf->bg.path)
      {