diff --git a/legacy/efreet/ChangeLog b/legacy/efreet/ChangeLog
index 7b98418335..7a49176933 100644
--- a/legacy/efreet/ChangeLog
+++ b/legacy/efreet/ChangeLog
@@ -52,3 +52,4 @@
 2011-02-07  Sebastian Dransfeld
 
 	* Don't create cache dir several times
+	* Do efreet_init before using efreet_*() functions
diff --git a/legacy/efreet/src/bin/efreet_desktop_cache_create.c b/legacy/efreet/src/bin/efreet_desktop_cache_create.c
index 8b8b9f6617..e0e51f1492 100644
--- a/legacy/efreet/src/bin/efreet_desktop_cache_create.c
+++ b/legacy/efreet/src/bin/efreet_desktop_cache_create.c
@@ -230,6 +230,8 @@ main(int argc, char **argv)
     if (!ecore_init()) goto ecore_error;
 
     efreet_cache_update = 0;
+    /* finish efreet init */
+    if (!efreet_init()) goto efreet_error;
 
     /* create homedir */
     snprintf(file, sizeof(file), "%s/efreet", efreet_cache_home_get());
@@ -250,9 +252,6 @@ main(int argc, char **argv)
         }
         goto efreet_error;
     }
-
-    /* finish efreet init */
-    if (!efreet_init()) goto efreet_error;
     edd = efreet_desktop_edd();
     if (!edd) goto edd_error;
 
diff --git a/legacy/efreet/src/bin/efreet_icon_cache_create.c b/legacy/efreet/src/bin/efreet_icon_cache_create.c
index b840a2e1db..cfa181844d 100644
--- a/legacy/efreet/src/bin/efreet_icon_cache_create.c
+++ b/legacy/efreet/src/bin/efreet_icon_cache_create.c
@@ -717,18 +717,19 @@ main(int argc, char **argv)
     if (!ecore_init()) return -1;
 
     efreet_cache_update = 0;
+    /* finish efreet init */
+    if (!efreet_init()) goto on_error;
+
     strs = eina_array_new(32);
 
     /* create homedir */
     snprintf(file, sizeof(file), "%s/efreet", efreet_cache_home_get());
-    if (!ecore_file_mkpath(file)) return -1;
+    if (!ecore_file_mkpath(file)) goto on_error;
 
     /* lock process, so that we only run one copy of this program */
     lockfd = cache_lock_file();
-    if (lockfd == -1) return -1;
+    if (lockfd == -1) goto on_error;
 
-    /* finish efreet init */
-    if (!efreet_init()) goto on_error;
     /* Need to init edd's, so they are like we want, not like userspace wants */
     icon_edd = efreet_icon_edd();
     fallback_edd = efreet_icon_fallback_edd();
@@ -980,7 +981,7 @@ on_error_efreet:
     efreet_shutdown();
 
 on_error:
-    close(lockfd);
+    if (lockfd > 0) close(lockfd);
 
     while ((path = eina_array_pop(strs)))
         eina_stringshare_del(path);