diff --git a/library/pkparse.c b/library/pkparse.c
index 89a0c5dbf..6e22ce4f7 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -182,7 +182,8 @@ static int pk_get_ecparams( unsigned char **p, const unsigned char *end,
     int ret;
 
     if ( end - *p < 1 )
-        return MBEDTLS_ERR_ASN1_OUT_OF_DATA;
+        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
+                MBEDTLS_ERR_ASN1_OUT_OF_DATA );
 
     /* Tag may be either OID or SEQUENCE */
     params->tag = **p;