diff --git a/cli/kthena/main.go b/cli/kthena/main.go
index 751f88362..94ed3a4ce 100644
--- a/cli/kthena/main.go
+++ b/cli/kthena/main.go
@@ -21,6 +21,8 @@ package main
 
 import (
 	"embed"
+	"fmt"
+	"os"
 
 	"github.com/volcano-sh/kthena/cli/kthena/cmd"
 )
@@ -30,5 +32,13 @@ var templatesFS embed.FS
 
 func main() {
 	cmd.InitTemplates(templatesFS)
+
+	defer func() {
+		if r := recover(); r != nil {
+			fmt.Println("Recovered:", r)
+			os.Exit(1)
+		}
+	}()
 	cmd.Execute()
+	os.Exit(0)
 }