diff --git a/legacy/edje/ChangeLog b/legacy/edje/ChangeLog
index d15ca53410..a900a0897f 100644
--- a/legacy/edje/ChangeLog
+++ b/legacy/edje/ChangeLog
@@ -577,3 +577,7 @@
 2012-08-30  Carsten Haitzler (The Rasterman)
 
         1.7.0 release
+
+2012-08-30  Cedric Bail
+
+	* Check the number of parameter for image in edc.
diff --git a/legacy/edje/NEWS b/legacy/edje/NEWS
index 75c558e046..ae9b9e5500 100644
--- a/legacy/edje/NEWS
+++ b/legacy/edje/NEWS
@@ -1,3 +1,16 @@
+Edje 1.8.0
+
+Changes since Edje 1.8.0:
+-------------------------
+
+Additions:
+
+Improvements:
+    * Check the number of parameter for image in edc.
+
+Fixes:
+
+
 Edje 1.7.0
 
 Changes since Edje 1.2.0:
diff --git a/legacy/edje/src/bin/edje_cc_handlers.c b/legacy/edje/src/bin/edje_cc_handlers.c
index a057416334..2f8a84ba21 100644
--- a/legacy/edje/src/bin/edje_cc_handlers.c
+++ b/legacy/edje/src/bin/edje_cc_handlers.c
@@ -1238,6 +1238,8 @@ st_images_image(void)
    unsigned int i;
    int v;
 
+   check_min_arg_count(2);
+
    if (!edje_file->image_dir)
      edje_file->image_dir = mem_alloc(SZ(Edje_Image_Directory));
 
diff --git a/legacy/edje/src/bin/edje_cc_out.c b/legacy/edje/src/bin/edje_cc_out.c
index 041bcf7bf9..9d327b1c77 100644
--- a/legacy/edje/src/bin/edje_cc_out.c
+++ b/legacy/edje/src/bin/edje_cc_out.c
@@ -225,7 +225,6 @@ check_image_part_desc(Edje_Part_Collection *pc, Edje_Part *ep,
 {
    unsigned int i;
 
-   /* FIXME: This check sounds like not a useful one */
    if (epd->image.id == -1 && epd->common.visible)
      WRN("Collection %s(%i): image attributes missing for "
 	 "part \"%s\", description \"%s\" %f",