diff --git a/src/encauth/ccm/ccm_add_aad.c b/src/encauth/ccm/ccm_add_aad.c
index 3dcf3ff..43a3d53 100644
--- a/src/encauth/ccm/ccm_add_aad.c
+++ b/src/encauth/ccm/ccm_add_aad.c
@@ -38,7 +38,7 @@ int ccm_add_aad(ccm_state *ccm,
       if (ccm->x == 16) {
          /* full block so let's encrypt it */
          if ((err = cipher_descriptor[ccm->cipher].ecb_encrypt(ccm->PAD, ccm->PAD, &ccm->K)) != CRYPT_OK) {
-            return CRYPT_ERROR;
+            return err;
          }
          ccm->x = 0;
       }
@@ -49,7 +49,7 @@ int ccm_add_aad(ccm_state *ccm,
    if (ccm->aadlen == ccm->current_aadlen) {
       if (ccm->x != 0) {
          if ((err = cipher_descriptor[ccm->cipher].ecb_encrypt(ccm->PAD, ccm->PAD, &ccm->K)) != CRYPT_OK) {
-            return CRYPT_ERROR;
+            return err;
          }
       }
       ccm->x = 0;