diff --git a/internal/cli/main.go b/internal/cli/main.go
index 6ff542790..c3b3d31d8 100644
--- a/internal/cli/main.go
+++ b/internal/cli/main.go
@@ -88,7 +88,6 @@ func Main(args []string) int {
 	if err != nil {
 		panic(err)
 	}
-	defer base.Close()
 
 	// Build the CLI
 	cli := &cli.CLI{
@@ -111,6 +110,14 @@ func Main(args []string) int {
 		panic(err)
 	}
 
+	err = base.Close()
+	if err != nil {
+		log.Error("failure encountered while closing command",
+			"error", err,
+		)
+		exitCode = -1
+	}
+
 	return exitCode
 }