diff --git a/src/lib/eet/Eet.h b/src/lib/eet/Eet.h
index c69c1153b4..39f060a170 100644
--- a/src/lib/eet/Eet.h
+++ b/src/lib/eet/Eet.h
@@ -3244,7 +3244,7 @@ EAPI int
 eet_data_text_dump(const void *data_in,
                    int size_in,
                    Eet_Dump_Callback dumpfunc,
-                   void *dumpdata);
+                   void *dumpdata) EINA_ARG_NONNULL(3);
 
 /**
  * Take an ascii encoding from eet_data_text_dump() and re-encode in binary.
@@ -3297,7 +3297,7 @@ EAPI int
 eet_data_dump(Eet_File *ef,
               const char *name,
               Eet_Dump_Callback dumpfunc,
-              void *dumpdata);
+              void *dumpdata) EINA_ARG_NONNULL(3);
 
 /**
  * Take an ascii encoding from eet_data_dump() and re-encode in binary.
@@ -4074,7 +4074,7 @@ eet_data_text_dump_cipher(const void *data_in,
                           const char *cipher_key,
                           int size_in,
                           Eet_Dump_Callback dumpfunc,
-                          void *dumpdata);
+                          void *dumpdata) EINA_ARG_NONNULL(4);
 
 /**
  * Take an ascii encoding from eet_data_text_dump() and re-encode
@@ -4133,7 +4133,7 @@ eet_data_dump_cipher(Eet_File *ef,
                      const char *name,
                      const char *cipher_key,
                      Eet_Dump_Callback dumpfunc,
-                     void *dumpdata);
+                     void *dumpdata) EINA_ARG_NONNULL(4);
 
 /**
  * Take an ascii encoding from eet_data_dump() and re-encode in
diff --git a/src/lib/eet/eet_data.c b/src/lib/eet/eet_data.c
index d4ba25f0eb..865eee9e86 100644
--- a/src/lib/eet/eet_data.c
+++ b/src/lib/eet/eet_data.c
@@ -2397,6 +2397,7 @@ eet_data_write_cipher(Eet_File            *ef,
    int val;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(edd, 0);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(data, 0);
 
    ed = eet_dictionary_get(ef);