diff --git a/shadowaead/protocol.go b/shadowaead/protocol.go
index 19844e7..12da043 100644
--- a/shadowaead/protocol.go
+++ b/shadowaead/protocol.go
@@ -232,7 +232,10 @@ func (c *clientPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksad
 	defer buffer.Release()
 	header := buf.With(buffer.ExtendHeader(c.keySaltLength + M.SocksaddrSerializer.AddrPortLen(destination)))
 	header.WriteRandom(c.keySaltLength)
-	common.Must(M.SocksaddrSerializer.WriteAddrPort(header, destination))
+	err := M.SocksaddrSerializer.WriteAddrPort(header, destination)
+	if err != nil {
+		return err
+	}
 	key := buf.NewSize(c.keySaltLength)
 	Kdf(c.key, buffer.To(c.keySaltLength), key)
 	writeCipher, err := c.constructor(key.Bytes())
diff --git a/shadowaead_2022/protocol.go b/shadowaead_2022/protocol.go
index 9d5e70e..2686354 100644
--- a/shadowaead_2022/protocol.go
+++ b/shadowaead_2022/protocol.go
@@ -297,7 +297,10 @@ func (c *clientConn) writeRequest(payload []byte) error {
 	writer.WriteChunk(header, fixedLengthBuffer.Slice())
 
 	variableLengthBuffer := buf.NewSize(variableLengthHeaderLen)
-	common.Must(M.SocksaddrSerializer.WriteAddrPort(variableLengthBuffer, c.destination))
+	err = M.SocksaddrSerializer.WriteAddrPort(variableLengthBuffer, c.destination)
+	if err != nil {
+		return err
+	}
 	common.Must(binary.Write(variableLengthBuffer, binary.BigEndian, uint16(paddingLen)))
 	if paddingLen > 0 {
 		variableLengthBuffer.Extend(paddingLen)