diff --git a/src/lib/eet/eet_image.c b/src/lib/eet/eet_image.c
index 1da7985d99..b77d90e510 100644
--- a/src/lib/eet/eet_image.c
+++ b/src/lib/eet/eet_image.c
@@ -1577,6 +1577,9 @@ eet_data_image_encode_cipher(const void  *data,
    unsigned int ciphered_sz = 0;
    int size = 0;
 
+   if (!data)
+     return NULL;
+
    switch (lossy)
      {
       case EET_IMAGE_LOSSLESS:
@@ -1688,6 +1691,9 @@ eet_data_image_header_advance_decode_cipher(const void   *data,
    unsigned int deciphered_sz = 0;
    int r = 0;
 
+   if (!data)
+     return NULL;
+
    if (cipher_key)
      {
         if (!eet_decipher(data, size, cipher_key, strlen(cipher_key),
@@ -2083,6 +2089,9 @@ eet_data_image_decode_cipher(const void   *data,
    void *deciphered_d = NULL;
    unsigned int deciphered_sz = 0;
 
+   if (!data)
+     return NULL;
+
    if (cipher_key)
      {
         if (!eet_decipher(data, size, cipher_key, strlen(cipher_key),
@@ -2171,6 +2180,9 @@ eet_data_image_decode_to_cspace_surface_cipher(const void   *data,
    void *deciphered_d = NULL;
    unsigned int deciphered_sz = 0;
 
+   if (!data)
+     return NULL;
+
    if (cipher_key)
      {
         if (!eet_decipher(data, size, cipher_key, strlen(cipher_key),