diff --git a/legacy/eet/ChangeLog b/legacy/eet/ChangeLog
index 9a2b8330f1..6ce029bc00 100644
--- a/legacy/eet/ChangeLog
+++ b/legacy/eet/ChangeLog
@@ -279,3 +279,7 @@
 
 	* Include winsock2.h in eet_image.c for htonl definition on Windows.
 	* Fix Visual Studio project files
+
+2009-12-11  Cedric BAIL
+
+	* Make eet_data_descriptor_free safe to call on NULL pointer.
diff --git a/legacy/eet/src/lib/eet_data.c b/legacy/eet/src/lib/eet_data.c
index 956dc007a0..ee9e4d1541 100644
--- a/legacy/eet/src/lib/eet_data.c
+++ b/legacy/eet/src/lib/eet_data.c
@@ -1317,6 +1317,7 @@ eet_data_descriptor_file_new(const Eet_Data_Descriptor_Class *eddc)
 EAPI void
 eet_data_descriptor_free(Eet_Data_Descriptor *edd)
 {
+   if (!edd) return ;
    _eet_descriptor_hash_free(edd);
    if (edd->elements.set) free(edd->elements.set);
    free(edd);