diff --git a/xmtp_id/src/scw_verifier/mod.rs b/xmtp_id/src/scw_verifier/mod.rs
index 70ed30e5e..9d69eb84d 100644
--- a/xmtp_id/src/scw_verifier/mod.rs
+++ b/xmtp_id/src/scw_verifier/mod.rs
@@ -29,6 +29,8 @@ pub enum VerifierError {
     Abi(#[from] ethers::abi::Error),
     #[error(transparent)]
     Provider(#[from] ethers::providers::ProviderError),
+    #[error(transparent)]
+    Tonic(tonic::Status),
 }
 
 #[async_trait]
diff --git a/xmtp_id/src/scw_verifier/remote_signature_verifier.rs b/xmtp_id/src/scw_verifier/remote_signature_verifier.rs
index 3200f559a..d1902222c 100644
--- a/xmtp_id/src/scw_verifier/remote_signature_verifier.rs
+++ b/xmtp_id/src/scw_verifier/remote_signature_verifier.rs
@@ -48,7 +48,7 @@ impl SmartContractSignatureVerifier for RemoteSignatureVerifier {
                 }],
             })
             .await
-            .unwrap();
+            .map_err(VerifierError::Tonic)?;
 
         let VerifySmartContractWalletSignaturesResponse { responses } = result.into_inner();