on panic(err), just print the message and exit

1 files changed, 12 insertions, 0 deletions

diff --git a/client/go/script-utils/main.go b/client/go/script-utils/main.go
index c80e04e9a0b..10d77da6aea 100644
--- a/client/go/script-utils/main.go
+++ b/client/go/script-utils/main.go
@@ -20,6 +20,7 @@ func basename(s string) string {
 }
 
 func main() {
+	defer handleSimplePanic()
 	action := basename(os.Args[0])
 	if action == "script-utils" && len(os.Args) > 1 {
 		action = os.Args[1]
@@ -58,3 +59,14 @@ func main() {
 		fmt.Fprintln(os.Stderr, "(also: vespa-deploy, vespa-logfmt)")
 	}
 }
+
+func handleSimplePanic() {
+	if r := recover(); r != nil {
+		if je, ok := r.(error); ok {
+			fmt.Fprintln(os.Stderr, je)
+			os.Exit(1)
+		} else {
+			panic(r)
+		}
+	}
+}