diff --git a/src/bin/edc_editor.c b/src/bin/edc_editor.c
index a7d999d..ce36c51 100644
--- a/src/bin/edc_editor.c
+++ b/src/bin/edc_editor.c
@@ -644,7 +644,11 @@ image_preview_show(edit_data *ed, char *cur, Evas_Coord x, Evas_Coord y)
            ctxpopup_img_preview_create(ed, fullpath,
                                        ctxpopup_preview_dismiss_cb,
                                        ctxpopup_preview_relay_cb);
-        if (!ctxpopup) return EINA_FALSE;
+        if (!ctxpopup)
+          {
+             free(filename);
+             return EINA_FALSE;
+          }
 
         evas_object_move(ctxpopup, x, y);
         evas_object_show(ctxpopup);
diff --git a/src/bin/edc_parser.c b/src/bin/edc_parser.c
index 4aceb5b..1484291 100644
--- a/src/bin/edc_parser.c
+++ b/src/bin/edc_parser.c
@@ -728,10 +728,18 @@ parser_cur_group_name_get(parser_data *pd, Evas_Object *entry,
    if (!td) return;
 
    const char *text = elm_entry_entry_get(entry);
-   if (!text) return;
+   if (!text)
+     {
+        free(td);
+        return;
+     }
 
    char *utf8 = elm_entry_markup_to_utf8(text);
-   if (!utf8) return;
+   if (!utf8)
+     {
+        free(td);
+        return;
+     }
 
    td->pd = pd;
    td->utf8 = utf8;
@@ -756,10 +764,18 @@ parser_cur_name_get(parser_data *pd, Evas_Object *entry, void (*cb)(void *data,
    if (!td) return;
 
    const char *text = elm_entry_entry_get(entry);
-   if (!text) return;
+   if (!text)
+     {
+        free(td);
+        return;
+     }
 
    char *utf8 = elm_entry_markup_to_utf8(text);
-   if (!utf8) return;
+   if (!utf8)
+     {
+        free(td);
+        return;
+     }
 
    td->pd = pd;
    td->utf8 = utf8;