diff --git a/legacy/edje/src/lib/edje_load.c b/legacy/edje/src/lib/edje_load.c
index aac4c7f7a1..6f706cb9f6 100644
--- a/legacy/edje/src/lib/edje_load.c
+++ b/legacy/edje/src/lib/edje_load.c
@@ -199,10 +199,13 @@ edje_file_data_get(const char *file, const char *key)
    if (key)
      {
 	edf = _edje_cache_file_coll_open(file, NULL, &error_ret, NULL);
-	if ((edf != NULL) && (edf->data_cache != NULL))
+	if (edf != NULL)
 	  {
-	     str = evas_hash_find(edf->data_cache, key);
-	     if (str) str = strdup(str);
+	     if (edf->data_cache != NULL)
+	       {
+		  str = evas_hash_find(edf->data_cache, key);
+		  if (str) str = strdup(str);
+	       }
 	     _edje_cache_file_unref(edf);
 	  }
      }
diff --git a/legacy/edje/src/lib/edje_main.c b/legacy/edje/src/lib/edje_main.c
index a46c7bbc2c..55138529ee 100644
--- a/legacy/edje/src/lib/edje_main.c
+++ b/legacy/edje/src/lib/edje_main.c
@@ -23,6 +23,7 @@ edje_init(void)
 	_edje_edd_setup();
 	_edje_text_init();
 	embryo_init();
+	eet_init();
      }
    _edje_message_init();
    return initted;
@@ -51,6 +52,7 @@ edje_shutdown(void)
    _edje_text_class_hash_free();
    embryo_shutdown();
    ecore_job_shutdown();
+   eet_shutdown();
 
    return 0;
 }