diff --git a/legacy/edje/src/bin/edje_cc.c b/legacy/edje/src/bin/edje_cc.c
index 13c5b1f9a6..b86ea8a5b6 100644
--- a/legacy/edje/src/bin/edje_cc.c
+++ b/legacy/edje/src/bin/edje_cc.c
@@ -196,7 +196,8 @@ main(int argc, char **argv)
 	exit(-1);
      }
 
-   edje_init();
+   if (!edje_init())
+     exit(-1);
 
    edje_file = mem_alloc(SZ(Edje_File));
    edje_file->compiler = strdup("edje_cc");
diff --git a/legacy/edje/src/bin/edje_decc.c b/legacy/edje/src/bin/edje_decc.c
index 0189ab8718..29aeecf17f 100644
--- a/legacy/edje/src/bin/edje_decc.c
+++ b/legacy/edje/src/bin/edje_decc.c
@@ -58,7 +58,8 @@ main(int argc, char **argv)
    int i;
 
    setlocale(LC_NUMERIC, "C");
-   eina_init();
+   if (!eina_init())
+     exit(-1);
    _edje_cc_log_dom = eina_log_domain_register("edje_decc", EDJE_CC_DEFAULT_LOG_COLOR);
    if(_edje_cc_log_dom < 0)
      {
@@ -89,15 +90,15 @@ main(int argc, char **argv)
 	exit(-1);
      }
 
-   edje_init();
-   eet_init();
+   if (!edje_init())
+     exit(-1);
    source_edd();
 
    if (!decomp()) return -1;
    output();
 
    eet_close(ef);
-   eet_shutdown();
+   edje_shutdown();
    eina_log_domain_unregister(_edje_cc_log_dom);
    _edje_cc_log_dom = -1;
    eina_shutdown();