diff --git a/tink/signature/internal/config_v0.cc b/tink/signature/internal/config_v0.cc
index a6c28159..0fc7813a 100644
--- a/tink/signature/internal/config_v0.cc
+++ b/tink/signature/internal/config_v0.cc
@@ -224,7 +224,7 @@ util::Status AddSignatureV0(Configuration& config) {
   }
 
   // Tink implements PQC signatures with BoringSSL, not OpenSSL.
-  #ifdef OPENSSL_IS_BORINGSSL
+#ifdef OPENSSL_IS_BORINGSSL
   // SLH DSA
   status = RegisterSlhDsaProtoSerialization();
   if (!status.ok()) {
@@ -254,9 +254,14 @@ util::Status AddSignatureV0(Configuration& config) {
   if (!status.ok()) {
     return status;
   }
-  return ConfigurationImpl::AddPrimitiveGetter<PublicKeyVerify, MlDsaPublicKey>(
-      NewMlDsaVerifyBoringSsl, config);
-  #endif
+  status =
+      ConfigurationImpl::AddPrimitiveGetter<PublicKeyVerify, MlDsaPublicKey>(
+          NewMlDsaVerifyBoringSsl, config);
+  if (!status.ok()) {
+    return status;
+  }
+#endif
+  return util::OkStatus();
 }
 
 }  // namespace internal
diff --git a/tink/signature/internal/key_gen_config_v0.cc b/tink/signature/internal/key_gen_config_v0.cc
index 2d4bb264..3631ddd7 100644
--- a/tink/signature/internal/key_gen_config_v0.cc
+++ b/tink/signature/internal/key_gen_config_v0.cc
@@ -83,9 +83,13 @@ util::Status AddSignatureKeyGenV0(KeyGenConfiguration& config) {
   if (!status.ok()) {
     return status;
   }
-  return KeyGenConfigurationImpl::AddKeyCreator<MlDsaParameters>(CreateMlDsaKey,
-                                                                 config);
+  status = KeyGenConfigurationImpl::AddKeyCreator<MlDsaParameters>(
+      CreateMlDsaKey, config);
+  if (!status.ok()) {
+    return status;
+  }
 #endif
+  return util::OkStatus();
 }
 
 }  // namespace internal