diff --git a/legacy/edje/src/lib/edje_load.c b/legacy/edje/src/lib/edje_load.c
index e754bb12b1..6ad9ad397c 100644
--- a/legacy/edje/src/lib/edje_load.c
+++ b/legacy/edje/src/lib/edje_load.c
@@ -455,8 +455,9 @@ edje_file_data_get(const char *file, const char *key)
 	     Edje_Data *di;
 	
 	     di = l->data;
-	     if (!strcmp(di->key, key))
+	     if ((di->key) && (key) && (!strcmp(di->key, key)))
 	       {
+		  if (!di->value) return NULL;
 		  str = strdup(di->value);
 		  break;
 	       }