fixup! exception handling

Author: ndossche

src/crypto/crypto_keys.cc

@@ -86,9 +86,15 @@ MaybeLocal<Value> ToV8Value(
     Environment* env,
     const BIOPointer& bio,
     const EVPKeyPointer::AsymmetricKeyEncodingConfig& config) {
-  if (!bio) return {};
+  if (!bio) {
+    THROW_ERR_CRYPTO_OPERATION_FAILED(env, "Invalid BIO pointer");
+    return {};
+  }
   BUF_MEM* bptr = bio;
-  if (!bptr) return {};
+  if (!bptr) {
+    THROW_ERR_CRYPTO_OPERATION_FAILED(env, "Unable to create BUF_MEM pointer");
+    return {};
+  }
   if (config.format == EVPKeyPointer::PKFormatType::PEM) {
     // PEM is an ASCII format, so we will return it as a string.
     return String::NewFromUtf8(
@@ -107,12 +113,7 @@ MaybeLocal<Value> WritePrivateKey(
     const EVPKeyPointer::PrivateKeyEncodingConfig& config) {
   if (!pkey) return {};
   auto res = pkey.writePrivateKey(config);
-  if (res) {
-    auto value = ToV8Value(env, std::move(res.value), config);
-    if (!value.IsEmpty()) {
-      return value;
-    }
-  }
+  if (res) return ToV8Value(env, std::move(res.value), config);
 
   ThrowCryptoError(
       env, res.openssl_error.value_or(0), "Failed to encode private key");
@@ -125,12 +126,7 @@ MaybeLocal<Value> WritePublicKey(
     const EVPKeyPointer::PublicKeyEncodingConfig& config) {
   if (!pkey) return {};
   auto res = pkey.writePublicKey(config);
-  if (res) {
-    auto value = ToV8Value(env, res.value, config);
-    if (!value.IsEmpty()) {
-      return value;
-    }
-  }
+  if (res) return ToV8Value(env, std::move(res.value), config);
 
   ThrowCryptoError(
       env, res.openssl_error.value_or(0), "Failed to encode public key");