I added some error-checking while integrating this patch.
Reviewed-by: NTim Hudson <tjh@openssl.org>