diff --git a/libs/hbb_common/src/udp.rs b/libs/hbb_common/src/udp.rs
index acf0bb222..d1896bdbc 100644
--- a/libs/hbb_common/src/udp.rs
+++ b/libs/hbb_common/src/udp.rs
@@ -66,8 +66,8 @@ impl FramedSocket {
             .await??
         };
         log::trace!(
-            "Socks5 udp connected, local addr: {}, target addr: {}",
-            framed.local_addr().unwrap(),
+            "Socks5 udp connected, local addr: {:?}, target addr: {}",
+            framed.local_addr(),
             framed.socks_addr()
         );
         Ok(Self::ProxySocks(framed))
@@ -80,7 +80,7 @@ impl FramedSocket {
         addr: impl IntoTargetAddr<'_>,
     ) -> ResultType<()> {
         let addr = addr.into_target_addr()?.to_owned();
-        let send_data = Bytes::from(msg.write_to_bytes().unwrap());
+        let send_data = Bytes::from(msg.write_to_bytes()?);
         let _ = match self {
             Self::Direct(f) => match addr {
                 TargetAddr::Ip(addr) => f.send((send_data, addr)).await?,
@@ -115,7 +115,7 @@ impl FramedSocket {
         match self {
             Self::Direct(f) => match f.next().await {
                 Some(Ok((data, addr))) => {
-                    Some(Ok((data, addr.into_target_addr().unwrap().to_owned())))
+                    Some(Ok((data, addr.into_target_addr().ok()?.to_owned())))
                 }
                 Some(Err(e)) => Some(Err(anyhow!(e))),
                 None => None,
diff --git a/src/common.rs b/src/common.rs
index b674c385b..6a96db464 100644
--- a/src/common.rs
+++ b/src/common.rs
@@ -258,6 +258,8 @@ async fn test_nat_type_() -> ResultType<bool> {
     });
     let mut port1 = 0;
     let mut port2 = 0;
+    let server1 = socket_client::get_target_addr(&server1)?;
+    let server2 = socket_client::get_target_addr(&server2)?;
     let mut addr = Config::get_any_listen_addr();
     for i in 0..2 {
         let mut socket = socket_client::connect_tcp(
@@ -434,7 +436,7 @@ pub fn check_software_update() {
 async fn _check_software_update() -> hbb_common::ResultType<()> {
     sleep(3.).await;
 
-    let rendezvous_server = get_rendezvous_server(1_000).await;
+    let rendezvous_server = socket_client::get_target_addr(&get_rendezvous_server(1_000).await)?;
     let mut socket =
         socket_client::new_udp(Config::get_any_listen_addr(), RENDEZVOUS_TIMEOUT).await?;