diff --git a/legacy/efreet/src/bin/efreet_icon_cache_create.c b/legacy/efreet/src/bin/efreet_icon_cache_create.c
index fdc3d29b50..c1d9d9e18d 100644
--- a/legacy/efreet/src/bin/efreet_icon_cache_create.c
+++ b/legacy/efreet/src/bin/efreet_icon_cache_create.c
@@ -555,7 +555,7 @@ icon_theme_index_read(Efreet_Cache_Icon_Theme *theme, const char *path)
         s = t;
         p = s;
 
-        while (p)
+        while ((p) && (*s))
         {
             p = strchr(s, ',');