diff --git a/cmd/toolbox/cmd/expanddir.go b/cmd/toolbox/cmd/expanddir.go
index 6939dc1..224ca0d 100644
--- a/cmd/toolbox/cmd/expanddir.go
+++ b/cmd/toolbox/cmd/expanddir.go
@@ -43,5 +43,5 @@ func expanddirRun(cmd *cobra.Command, args []string) {
 		log.Fatalf("failed to expand dir %q: %v", expDir, err)
 	}
 
-	io.WriteString(os.Stdout, expDir)
+	_, _ = io.WriteString(os.Stdout, expDir)
 }
diff --git a/cmd/toolbox/cmd/toolbox.go b/cmd/toolbox/cmd/toolbox.go
index 1da6c5e..3153c00 100644
--- a/cmd/toolbox/cmd/toolbox.go
+++ b/cmd/toolbox/cmd/toolbox.go
@@ -15,6 +15,9 @@
 package cmd
 
 import (
+	"log"
+	"os"
+
 	"agola.io/agola/cmd"
 
 	"github.com/spf13/cobra"
@@ -25,9 +28,15 @@ var CmdToolbox = &cobra.Command{
 	Short:   "toolbox",
 	Version: cmd.Version,
 	// just defined to make --version work
-	Run: func(c *cobra.Command, args []string) { c.Help() },
+	Run: func(c *cobra.Command, args []string) {
+		if err := c.Help(); err != nil {
+			log.Fatal(err)
+		}
+	},
 }
 
 func Execute() {
-	CmdToolbox.Execute()
+	if err := CmdToolbox.Execute(); err != nil {
+		os.Exit(1)
+	}
 }