diff --git a/cmd/headscale/headscale.go b/cmd/headscale/headscale.go
index 8e8c0059..bedfdb92 100644
--- a/cmd/headscale/headscale.go
+++ b/cmd/headscale/headscale.go
@@ -49,7 +49,10 @@ var serveCmd = &cobra.Command{
 		if err != nil {
 			log.Fatalf("Error initializing: %s", err)
 		}
-		h.Serve()
+		err = h.Serve()
+		if err != nil {
+			log.Fatalf("Error initializing: %s", err)
+		}
 	},
 }