diff --git a/legacy/edje/src/lib/edje_calc.c b/legacy/edje/src/lib/edje_calc.c
index fbeaeb848d..a88233b9e2 100644
--- a/legacy/edje/src/lib/edje_calc.c
+++ b/legacy/edje/src/lib/edje_calc.c
@@ -464,7 +464,7 @@ _edje_part_recalc_single(Edje *ed,
 	for (l = ed->file->styles; l; l = l->next)
 	  {
 	     stl = l->data;
-	     if (!strcmp(stl->name, style)) break;
+	     if ((stl->name) && (!strcmp(stl->name, style))) break;
 	     stl = NULL;
 	  }
 	
diff --git a/legacy/edje/src/lib/edje_textblock_styles.c b/legacy/edje/src/lib/edje_textblock_styles.c
index 24c1578b64..c59777ae62 100644
--- a/legacy/edje/src/lib/edje_textblock_styles.c
+++ b/legacy/edje/src/lib/edje_textblock_styles.c
@@ -82,7 +82,7 @@ _edje_format_parse(char **s)
    char *s1 = NULL, *s2 = NULL;
    
    p = *s;
-   if (*p == 0) return NULL;
+   if ((!p) || (*p == 0)) return NULL;
    for (;;)
      {
 	if (!s1)
@@ -250,6 +250,7 @@ _edje_textblock_style_parse_and_fix(Edje_File *edf)
 	for (ll = stl->tags; ll; ll = ll->next)
 	  {
 	     tag = ll->data;
+	     if (!tag->key) continue;
 	     len += strlen(tag->key);
 	     len += 1;
 	     len += 1;
@@ -273,6 +274,7 @@ _edje_textblock_style_parse_and_fix(Edje_File *edf)
 	for (ll = stl->tags; ll; ll = ll->next)
 	  {
 	     tag = ll->data;
+	     if (!tag->key) continue;
 	     strcat(buf, tag->key);
 	     strcat(buf, "='");
 	     ts = _edje_format_reparse(edf, tag->value);