diff --git a/cmd/convert.go b/cmd/convert.go
index f382fc8c..86ffaca5 100644
--- a/cmd/convert.go
+++ b/cmd/convert.go
@@ -15,7 +15,6 @@
 package cmd
 
 import (
-	"os"
 	"runtime"
 
 	. "github.com/mudler/luet/pkg/logger"
@@ -36,8 +35,7 @@ var convertCmd = &cobra.Command{
 		c := viper.GetInt("concurrency")
 
 		if len(args) != 2 {
-			Error("Incorrect number of arguments")
-			os.Exit(1)
+			Fatal("Incorrect number of arguments")
 		}
 
 		input := args[0]
@@ -54,8 +52,7 @@ var convertCmd = &cobra.Command{
 
 		packageTree, err := builder.Generate(input)
 		if err != nil {
-			Error("Error: " + err.Error())
-			os.Exit(1)
+			Fatal("Error: " + err.Error())
 		}
 
 		defer packageTree.GetPackageSet().Clean()
@@ -67,8 +64,7 @@ var convertCmd = &cobra.Command{
 		generalRecipe.WithTree(packageTree)
 		err = generalRecipe.Save(output)
 		if err != nil {
-			Error("Error: " + err.Error())
-			os.Exit(1)
+			Fatal("Error: " + err.Error())
 		}
 	},
 }
diff --git a/cmd/query.go b/cmd/query.go
index aa1dcc67..236d72b0 100644
--- a/cmd/query.go
+++ b/cmd/query.go
@@ -17,7 +17,8 @@ package cmd
 import (
 	"fmt"
 	"log"
-	"os"
+
+	. "github.com/mudler/luet/pkg/logger"
 
 	pkg "github.com/mudler/luet/pkg/package"
 	"github.com/mudler/luet/pkg/solver"
@@ -44,8 +45,7 @@ var queryCmd = &cobra.Command{
 
 		err := generalRecipe.Load(input)
 		if err != nil {
-			fmt.Println("Error: " + err.Error())
-			os.Exit(1)
+			Fatal("Error: " + err.Error())
 		}
 
 		defer generalRecipe.Tree().GetPackageSet().Clean()
@@ -60,15 +60,13 @@ var queryCmd = &cobra.Command{
 			// Tree caches generated world when using FindPackage
 			pack, err := generalRecipe.Tree().FindPackage(&pkg.DefaultPackage{Category: cat, Name: v, Version: version})
 			if err != nil {
-				fmt.Println("Error: " + err.Error())
-				os.Exit(1)
+				Fatal("Error: " + err.Error())
 			}
 
 			fmt.Println("Install query from " + input + " [" + v + "]")
 			world, err := generalRecipe.Tree().World()
 			if err != nil {
-				fmt.Println("Error: " + err.Error())
-				os.Exit(1)
+				Fatal("Error: " + err.Error())
 			}
 			fmt.Println(">>> World")
 			for _, packss := range world {
@@ -77,8 +75,7 @@ var queryCmd = &cobra.Command{
 			s := solver.NewSolver([]pkg.Package{}, world)
 			solution, err := s.Install([]pkg.Package{pack})
 			if err != nil {
-				fmt.Println("Error: " + err.Error())
-				os.Exit(1)
+				Fatal("Error: " + err.Error())
 			}
 			fmt.Println(">>> Solution")