diff --git a/control/cmd/control/main.go b/control/cmd/control/main.go
index d79f259735..23c1dbdf6e 100644
--- a/control/cmd/control/main.go
+++ b/control/cmd/control/main.go
@@ -692,6 +692,9 @@ func realMain(ctx context.Context) error {
 		// XXX(JordiSubira): Just take the first address, we only use topology.json with
 		// information for one unique AS.
 		hpListener, err := nc.OpenListener(a[0].String())
+		if err != nil {
+			return serrors.WrapStr("opening listener for HP", err)
+		}
 		g.Go(func() error {
 			defer log.HandlePanic()
 			if err := hpInterASServer.Serve(hpListener); err != nil {
diff --git a/control/hiddenpaths.go b/control/hiddenpaths.go
index 3d57af693f..eeee20711e 100644
--- a/control/hiddenpaths.go
+++ b/control/hiddenpaths.go
@@ -45,7 +45,10 @@ type HiddenPathConfigurator struct {
 // location. An empty location will not enable any hidden path behavior. It
 // returns the configuration for the hidden segment writer. The return value can
 // be nil if this AS isn't a writer.
-func (c HiddenPathConfigurator) Setup(location string) (*grpc.Server, *HiddenPathRegistrationCfg, error) {
+func (c HiddenPathConfigurator) Setup(
+	location string,
+) (*grpc.Server, *HiddenPathRegistrationCfg, error) {
+
 	if location == "" {
 		return nil, nil, nil
 	}