diff --git a/btio/btio.c b/btio/btio.c
index 30804ca..43275cb 100644
--- a/btio/btio.c
+++ b/btio/btio.c
@@ -1665,12 +1665,16 @@ static bool get_bc_sid(int sock, uint8_t *sid, GError **err)
 
 	olen = sizeof(addr);
 	memset(&addr, 0, olen);
-	if (getpeername(sock, (void *)&addr, &olen) < 0 ||
-				olen != sizeof(addr)) {
+	if (getpeername(sock, (void *)&addr, &olen) < 0) {
 		ERROR_FAILED(err, "getpeername", errno);
 		return false;
 	}
 
+	if (olen != sizeof(addr)) {
+		ERROR_FAILED(err, "getpeername: size mismatch", EINVAL);
+		return false;
+	}
+
 	*sid = addr.iso.iso_bc->bc_sid;
 
 	return true;