diff --git a/native/cpp/CommonCpp/grpc/grpc_client/src/lib.rs b/native/cpp/CommonCpp/grpc/grpc_client/src/lib.rs
--- a/native/cpp/CommonCpp/grpc/grpc_client/src/lib.rs
+++ b/native/cpp/CommonCpp/grpc/grpc_client/src/lib.rs
@@ -28,7 +28,8 @@
   GetUserIdResponse, PakeLoginResponse as PakeLoginResponseStruct,
   PakeRegistrationRequestAndUserId as PakeRegistrationRequestAndUserIdStruct,
   PakeRegistrationUploadAndCredentialRequest as PakeRegistrationUploadAndCredentialRequestStruct,
-  RegistrationRequest, VerifyUserTokenRequest, VerifyUserTokenResponse,
+  RegistrationRequest, RegistrationResponse as RegistrationResponseMessage,
+  VerifyUserTokenRequest, VerifyUserTokenResponse,
 };
 pub mod identity {
   tonic::include_proto!("identity");
@@ -198,3 +199,10 @@
     })
     .map(|res| res.message)
 }
+
+fn handle_unexpected_registration_response(
+  message: Option<RegistrationResponseMessage>,
+) -> Status {
+  error!("Received an unexpected message: {:?}", message);
+  Status::invalid_argument("Invalid response data")
+}