diff --git a/internal/adapters/wireguard.go b/internal/adapters/wireguard.go
index a02f614..6c15771 100644
--- a/internal/adapters/wireguard.go
+++ b/internal/adapters/wireguard.go
@@ -393,8 +393,14 @@ func (r *WgRepo) getOrCreatePeer(deviceId domain.InterfaceIdentifier, id domain.
 			},
 		},
 	})
+	if err != nil {
+		return nil, fmt.Errorf("peer create error for %s: %w", id.ToPublicKey(), err)
+	}
 
 	peer, err = r.getPeer(deviceId, id)
+	if err != nil {
+		return nil, fmt.Errorf("peer error after create: %w", err)
+	}
 	return peer, nil
 }