diff --git a/library/rsa.c b/library/rsa.c
index 2baf53257..4c85c29d4 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -856,8 +856,7 @@ int mbedtls_rsa_rsaes_pkcs1_v15_decrypt( mbedtls_rsa_context *ctx,
         bad |= *p++; /* Must be zero */
     }
 
-    if( pad_count < 8 )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+    bad |= ( pad_count < 8 );
 
     if( bad )
         return( MBEDTLS_ERR_RSA_INVALID_PADDING );