diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 1a1f0c09cf..00c25db3ce 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -3177,15 +3177,17 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
      return;
 #endif
 
-   if (ep->param1.description->rel1.id_x >= 0)
-     rp1[Rel1X] = ed->table_parts[ep->param1.description->rel1.id_x];
-   if (ep->param1.description->rel2.id_x >= 0)
-     rp1[Rel2X] = ed->table_parts[ep->param1.description->rel2.id_x];
-   if (ep->param1.description->rel1.id_y >= 0)
-     rp1[Rel1Y] = ed->table_parts[ep->param1.description->rel1.id_y];
-   if (ep->param1.description->rel2.id_y >= 0)
-     rp1[Rel2Y] = ed->table_parts[ep->param1.description->rel2.id_y];
-
+   if (ep->param1.description) 
+     {
+       if (ep->param1.description->rel1.id_x >= 0)
+         rp1[Rel1X] = ed->table_parts[ep->param1.description->rel1.id_x];
+       if (ep->param1.description->rel2.id_x >= 0)
+         rp1[Rel2X] = ed->table_parts[ep->param1.description->rel2.id_x];
+       if (ep->param1.description->rel1.id_y >= 0)
+         rp1[Rel1Y] = ed->table_parts[ep->param1.description->rel1.id_y];
+       if (ep->param1.description->rel2.id_y >= 0)
+         rp1[Rel2Y] = ed->table_parts[ep->param1.description->rel2.id_y];
+     }
    if (ep->param2)
      {
         if (ep->param2->description->rel1.id_x >= 0)
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 15c3de9c2e..57246dca5c 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -2193,6 +2193,7 @@ _edje_edit_real_part_add(Evas_Object *obj, const char *name, Edje_Part_Type type
    if (_edje_real_part_get(ed, name))
      return EINA_FALSE;
 
+   if (ed->file)
    ce = eina_hash_find(ed->file->collection, ed->group);
 
    /* Alloc Edje_Part or return */
@@ -3340,7 +3341,7 @@ edje_edit_state_add(Evas_Object *obj, const char *part, const char *name, double
 		  external->external_params = eina_list_append(external->external_params, p);
 		  pi++;
 	       }
-	     if (external->external_params)
+	     if (external->external_params && rp->typedata.swallow)
 	       rp->param1.external_params = _edje_external_params_parse(rp->typedata.swallow->swallowed_object, external->external_params);
 	  }
      }