diff --git a/donut-main.go b/donut-main.go
index 9c9bf5ed1..7c1bf2a5e 100644
--- a/donut-main.go
+++ b/donut-main.go
@@ -22,6 +22,7 @@ import (
 
 	"github.com/minio/cli"
 	"github.com/minio/minio/pkg/donut"
+	"github.com/minio/minio/pkg/probe"
 )
 
 var (
@@ -68,19 +69,19 @@ func makeDonutMain(c *cli.Context) {
 	var disks []string
 	for _, disk := range c.Args().Tail() {
 		if _, err := isUsable(disk); err != nil {
-			Fatalln(err)
+			Fatalln(err.Trace())
 		}
 		disks = append(disks, disk)
 	}
 	for _, disk := range disks {
 		if err := os.MkdirAll(filepath.Join(disk, donutName), 0700); err != nil {
-			Fatalln(err)
+			Fatalln(probe.NewError(err))
 		}
 	}
 
 	hostname, err := os.Hostname()
 	if err != nil {
-		Fatalln(err)
+		Fatalln(probe.NewError(err))
 	}
 	donutConfig := &donut.Config{}
 	donutConfig.Version = "0.0.1"
@@ -92,7 +93,7 @@ func makeDonutMain(c *cli.Context) {
 	donutConfig.MaxSize = 512000000
 
 	if err := donut.SaveConfig(donutConfig); err != nil {
-		Fatalln(err)
+		Fatalln(err.Trace())
 	}
 
 	Infoln("Success!")
diff --git a/server-main.go b/server-main.go
index a2055f28d..f7f803e59 100644
--- a/server-main.go
+++ b/server-main.go
@@ -60,8 +60,7 @@ func serverMain(c *cli.Context) {
 		cli.ShowCommandHelpAndExit(c, "server", 1)
 	}
 	apiServerConfig := getServerConfig(c)
-	err := server.StartServices(apiServerConfig)
-	if err != nil {
-		Fatalln(err)
+	if err := server.StartServices(apiServerConfig); err != nil {
+		Fatalln(err.Trace())
 	}
 }