diff --git a/src/bin/edje/edje_cc.c b/src/bin/edje/edje_cc.c
index 9452fff17c..63a62b117c 100644
--- a/src/bin/edje/edje_cc.c
+++ b/src/bin/edje/edje_cc.c
@@ -42,6 +42,7 @@ int        threads = 0;
 int        annotate = 0;
 int        no_etc1 = 0;
 int        no_etc2 = 0;
+int        beta = 0;
 
 static void
 _edje_cc_log_cb(const Eina_Log_Domain *d,
@@ -310,6 +311,10 @@ main(int argc, char **argv)
 	     depfile = argv[i];
 	     unlink(depfile);
 	  }
+        else if (!strcmp(argv[i], "-beta"))
+          {
+             beta = 1;
+          }
 	else if (!file_in)
 	  file_in = argv[i];
 	else if (!file_out)
diff --git a/src/bin/edje/edje_cc.h b/src/bin/edje/edje_cc.h
index ad930c9e93..e73ba01f3d 100644
--- a/src/bin/edje/edje_cc.h
+++ b/src/bin/edje/edje_cc.h
@@ -306,6 +306,7 @@ extern int                    threads;
 extern int                    annotate;
 extern Eina_Bool current_group_inherit;
 extern Eina_List             *color_tree_root;
+extern int                    beta;
 
 extern int had_quote;
 
diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c
index 823991872c..eb708d9cea 100644
--- a/src/bin/edje/edje_cc_out.c
+++ b/src/bin/edje/edje_cc_out.c
@@ -1235,7 +1235,7 @@ on_error:
 static void
 data_write_vectors(Eet_File *ef, int *vector_num)
 {
-   int i;
+   unsigned int i;
    Svg_Node *root;
    Eet_Data_Descriptor *svg_node_eet;
    Eina_List *ll;
@@ -1249,8 +1249,11 @@ data_write_vectors(Eet_File *ef, int *vector_num)
 
    svg_node_eet = _edje_svg_node_eet();
 
-   for (i = 0; i < (int)edje_file->image_dir->vectors_count; i++)
+   for (i = 0; i < edje_file->image_dir->vectors_count; i++)
      {
+        if (!beta)
+          error_and_abort(ef, "Vector part are currently a beta feature, please enable them by running edje_cc with -beta.");
+
         vector = &edje_file->image_dir->vectors[i];
         EINA_LIST_FOREACH(img_dirs, ll, s)
           {