diff --git a/cmd/root.go b/cmd/root.go
index 2f6a86a..e1a82e2 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -28,8 +28,7 @@ var rootCmd = &cobra.Command{
 	Long: styles.TitleStyle.Render("Forkspacer CLI") + "\n\n" +
 		"A cloud-native Kubernetes operator for dynamic workspace lifecycle management.\n" +
 		"Create, manage, and hibernate ephemeral development environments at scale.",
-	SilenceUsage:  true,
-	SilenceErrors: true,
+	SilenceUsage: true,
 }
 
 // Execute adds all child commands to the root command and sets flags appropriately.
diff --git a/main.go b/main.go
index 53f82ec..f744609 100644
--- a/main.go
+++ b/main.go
@@ -1,14 +1,12 @@
 package main
 
 import (
-	"os"
-
 	"github.com/forkspacer/cli/cmd"
 	_ "github.com/forkspacer/cli/cmd/workspace"
 )
 
 func main() {
 	if err := cmd.Execute(); err != nil {
-		os.Exit(1)
+		cmd.HandleError(err)
 	}
 }