diff --git a/main.go b/main.go
index 813eeb4b2..7b1d498dc 100644
--- a/main.go
+++ b/main.go
@@ -143,6 +143,11 @@ VERSION:
 {{$key}}:
   {{$value}}
 {{end}}
+
 `
+	app.CommandNotFound = func(ctx *cli.Context, command string) {
+		Fatalf("Command not found: ‘%s’\n", command)
+	}
+
 	app.RunAndExitOnError()
 }
diff --git a/pkg/donut/donut-v2.go b/pkg/donut/donut-v2.go
index 81efd2180..2558e1256 100644
--- a/pkg/donut/donut-v2.go
+++ b/pkg/donut/donut-v2.go
@@ -517,7 +517,7 @@ func (donut API) ListObjects(bucket string, resources BucketResourcesMetadata, s
 			resources.Maxkeys,
 		)
 		if err != nil {
-			return nil, BucketResourcesMetadata{IsTruncated: false}, probe.New(err)
+			return nil, BucketResourcesMetadata{IsTruncated: false}, err.Trace()
 		}
 		resources.CommonPrefixes = listObjects.CommonPrefixes
 		resources.IsTruncated = listObjects.IsTruncated
@@ -604,7 +604,7 @@ func (donut API) ListBuckets(signature *Signature) ([]BucketMetadata, *probe.Err
 	if len(donut.config.NodeDiskMap) > 0 {
 		buckets, err := donut.listBuckets()
 		if err != nil {
-			return nil, probe.New(err)
+			return nil, err.Trace()
 		}
 		for _, bucketMetadata := range buckets {
 			results = append(results, bucketMetadata)
diff --git a/pkg/server/minhttp/http.go b/pkg/server/minhttp/http.go
index 97a87e8d5..821c551b1 100644
--- a/pkg/server/minhttp/http.go
+++ b/pkg/server/minhttp/http.go
@@ -49,7 +49,7 @@ func (a *app) listen() *probe.Error {
 	for _, s := range a.servers {
 		l, err := a.net.Listen("tcp", s.Addr)
 		if err != nil {
-			return probe.New(err)
+			return err.Trace()
 		}
 		if s.TLSConfig != nil {
 			l = tls.NewListener(l, s.TLSConfig)