diff --git a/src/conn.rs b/src/conn.rs
index a4c4f4e..daa0235 100644
--- a/src/conn.rs
+++ b/src/conn.rs
@@ -46,7 +46,7 @@ impl ServerConn {
 		let peer_id = handshake.peer_pk.clone();
 
 		let tokio_socket = asyncstd_socket.into_inner();
-		let remote_addr = tokio_socket.peer_addr().unwrap();
+		let remote_addr = tokio_socket.peer_addr()?;
 
 		debug!(
 			"Handshake complete (server) with {}@{}",
@@ -160,7 +160,7 @@ impl ClientConn {
 		.await?;
 
 		let tokio_socket = asyncstd_socket.into_inner();
-		let remote_addr = tokio_socket.peer_addr().unwrap();
+		let remote_addr = tokio_socket.peer_addr()?;
 
 		debug!(
 			"Handshake complete (client) with {}@{}",
diff --git a/src/netapp.rs b/src/netapp.rs
index eed0f59..0ddd447 100644
--- a/src/netapp.rs
+++ b/src/netapp.rs
@@ -210,7 +210,10 @@ impl NetApp {
 			let (socket, _) = listener.accept().await.unwrap();
 			info!(
 				"Incoming connection from {}, negotiating handshake...",
-				socket.peer_addr().unwrap()
+				match socket.peer_addr() {
+					Ok(x) => format!("{}", x),
+					Err(e) => format!("<invalid addr: {}>", e),
+				}
 			);
 			let self2 = self.clone();
 			tokio::spawn(async move {