Merge pull request #381 from fkautz/pr_out_upgrading_iodine

Godeps/Godeps.json

@@ -20,7 +20,7 @@
 		},
 		{
 			"ImportPath": "github.com/minio-io/iodine",
-			"Rev": "f92ca01c8671d9565c7aa58e3427364c5e187ccf"
+			"Rev": "2843626767a878d03d02acd4d2bc3790eb325b64"
 		},
 		{
 			"ImportPath": "gopkg.in/check.v1",

Godeps/_workspace/src/github.com/minio-io/iodine/iodine.go

@@ -91,15 +91,18 @@ func GetGlobalStateKey(k string) string {
 // New - instantiate an error, turning it into an iodine error.
 // Adds an initial stack trace.
 func New(err error, data map[string]string) *Error {
-	entry := createStackEntry()
-	for k, v := range data {
-		entry.Data[k] = v
-	}
-	return &Error{
-		EmbeddedError: err,
-		ErrorMessage:  err.Error(),
-		Stack:         []StackEntry{entry},
+	if err != nil {
+		entry := createStackEntry()
+		for k, v := range data {
+			entry.Data[k] = v
+		}
+		return &Error{
+			EmbeddedError: err,
+			ErrorMessage:  err.Error(),
+			Stack:         []StackEntry{entry},
+		}
 	}
+	return nil
 }
 
 // createStackEntry - create stack entries