diff --git a/include/polarssl/error.h b/include/polarssl/error.h
index 4145a50d5..f3514df91 100644
--- a/include/polarssl/error.h
+++ b/include/polarssl/error.h
@@ -49,7 +49,7 @@
  *
  * Module   Nr  Codes assigned 
  * MPI       7  0x0002-0x0010
- * GCM       1  0x0012-0x0012
+ * GCM       2  0x0012-0x0014
  * AES       2  0x0020-0x0022
  * CAMELLIA  2  0x0024-0x0026
  * XTEA      1  0x0028-0x0028
diff --git a/library/error.c b/library/error.c
index 471910d63..61ff9c719 100644
--- a/library/error.c
+++ b/library/error.c
@@ -447,6 +447,8 @@ void error_strerror( int ret, char *buf, size_t buflen )
 #if defined(POLARSSL_GCM_C)
     if( use_ret == -(POLARSSL_ERR_GCM_AUTH_FAILED) )
         snprintf( buf, buflen, "GCM - Authenticated decryption failed" );
+    if( use_ret == -(POLARSSL_ERR_GCM_BAD_INPUT) )
+        snprintf( buf, buflen, "GCM - Bad input parameters to function" );
 #endif /* POLARSSL_GCM_C */
 
 #if defined(POLARSSL_MD2_C)