diff --git a/library/cipher.c b/library/cipher.c
index 4abc427..d14781b 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -728,7 +728,7 @@
             diff |= tag[i] ^ check_tag[i];
 
         if( diff != 0 )
-            return( POLARSSL_ERR_GCM_AUTH_FAILED );
+            return( POLARSSL_ERR_CIPHER_AUTH_FAILED );
 
         return( 0 );
     }
diff --git a/library/error.c b/library/error.c
index f674768..8506897 100644
--- a/library/error.c
+++ b/library/error.c
@@ -187,6 +187,8 @@
             snprintf( buf, buflen, "CIPHER - Input data contains invalid padding and is rejected" );
         if( use_ret == -(POLARSSL_ERR_CIPHER_FULL_BLOCK_EXPECTED) )
             snprintf( buf, buflen, "CIPHER - Decryption of block requires a full block" );
+        if( use_ret == -(POLARSSL_ERR_CIPHER_AUTH_FAILED) )
+            snprintf( buf, buflen, "CIPHER - Authentication failed (for AEAD modes)" );
 #endif /* POLARSSL_CIPHER_C */
 
 #if defined(POLARSSL_DHM_C)