diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index edbe5cd37c..f3381fa76c 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -2905,6 +2905,7 @@ edje_edit_external_add(Evas_Object *obj, const char *external)
 
    if (!ed->file->external_dir)
      ed->file->external_dir = _alloc(sizeof(Edje_External_Directory));
+   if (!ed->file->external_dir) return EINA_FALSE;
 
    for (i = 0; i < ed->file->external_dir->entries_count; ++i)
      if (!ed->file->external_dir->entries[i].entry)
@@ -12555,6 +12556,7 @@ edje_edit_source_generate(Evas_Object *obj)
           {
              es = eina_hash_find(ed->file->data, entry);
              str = edje_string_get(es);
+             if (!str) break;
              data_len = strlen(str);
              /* In case when data ends with '\n' character, this item recognize
               * as data.file. This data will not generated into the source code