diff --git a/legacy/edje/ChangeLog b/legacy/edje/ChangeLog
index 969d850236..508d9042ac 100644
--- a/legacy/edje/ChangeLog
+++ b/legacy/edje/ChangeLog
@@ -526,4 +526,4 @@
 2012-07-12  Cedric Bail
 
 	* Warn at compile time about forgotten image definition.
-
+	* Stop compilation when clipping to a non RECT part.
diff --git a/legacy/edje/NEWS b/legacy/edje/NEWS
index 1bb829e253..a7fc6f4905 100644
--- a/legacy/edje/NEWS
+++ b/legacy/edje/NEWS
@@ -12,6 +12,7 @@ Additions:
     * Add accessibility flags and API to retrieve the relevant part.
     * Emit signal when flagged part size get to zero.
     * Warn at compile time about forgotten image.
+    * Stop compilation when clipping to a non RECT part.
 
 Improvements:
     * Allocate once and reuse Evas_Map.
diff --git a/legacy/edje/src/bin/edje_cc_out.c b/legacy/edje/src/bin/edje_cc_out.c
index f5580f9904..f89cfed135 100644
--- a/legacy/edje/src/bin/edje_cc_out.c
+++ b/legacy/edje/src/bin/edje_cc_out.c
@@ -289,6 +289,12 @@ check_part(Edje_Part_Collection *pc, Edje_Part *ep, Eet_File *ef)
    else if ((ep->type == EDJE_PART_TYPE_BOX) ||
 	    (ep->type == EDJE_PART_TYPE_TABLE))
      check_packed_items(pc, ep, ef);
+
+   /* FIXME: When mask are supported remove this check */
+   if (ep->clip_to_id != -1 &&
+       pc->parts[ep->clip_to_id]->type != EDJE_PART_TYPE_RECTANGLE)
+     error_and_abort(ef, "Collection %i: clip_to point to a non RECT part '%s' !\n",
+                     pc->id, pc->parts[ep->clip_to_id]->name);
 }
 
 static void