diff --git a/cmd/root.go b/cmd/root.go
index 6f658e73..a5d60fee 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -17,8 +17,6 @@ limitations under the License.
 package cmd
 
 import (
-	"fmt"
-	"os"
 	"strings"
 
 	log "github.com/sirupsen/logrus"
@@ -87,12 +85,10 @@ var RootCmd = &cobra.Command{
 	},
 }
 
-// Execute TODO: comment
-func Execute() {
-	if err := RootCmd.Execute(); err != nil {
-		fmt.Println(err)
-		os.Exit(-1)
-	}
+// Execute executes the root level command.
+// It returns an erorr if any.
+func Execute() error {
+	return RootCmd.Execute()
 }
 
 func init() {
diff --git a/main.go b/main.go
index 9a0df601..35b97068 100644
--- a/main.go
+++ b/main.go
@@ -16,8 +16,15 @@ limitations under the License.
 
 package main
 
-import "github.com/kubernetes/kompose/cmd"
+import (
+	"log"
+
+	"github.com/kubernetes/kompose/cmd"
+)
 
 func main() {
-	cmd.Execute()
+	if err := cmd.Execute(); err != nil {
+		log.SetFlags(0)
+		log.Fatal(err)
+	}
 }