diff --git a/http/handler.go b/http/handler.go
index 3226eee50..5b79deef6 100644
--- a/http/handler.go
+++ b/http/handler.go
@@ -347,7 +347,7 @@ func (r *successResponse) check(err error) (statusCode int) {
 	}
 
 	r.Success = false
-	r.Error = &Error{Message: cause.Error()}
+	r.Error = &Error{Message: err.Error()}
 
 	return statusCode
 }
diff --git a/index.go b/index.go
index e94692288..da749ff2d 100644
--- a/index.go
+++ b/index.go
@@ -155,7 +155,7 @@ func (i *Index) openFields() error {
 
 		fld, err := i.newField(i.fieldPath(filepath.Base(fi.Name())), filepath.Base(fi.Name()))
 		if err != nil {
-			return ErrName
+			return errors.Wrapf(ErrName, "'%s'", fi.Name())
 		}
 		if err := fld.Open(); err != nil {
 			return fmt.Errorf("open field: name=%s, err=%s", fld.Name(), err)
diff --git a/pilosa.go b/pilosa.go
index f8989e9b7..28eb4545f 100644
--- a/pilosa.go
+++ b/pilosa.go
@@ -16,7 +16,7 @@ package pilosa
 
 import (
 	"encoding/json"
-	"errors"
+	"github.com/pkg/errors"
 	"regexp"
 )
 
@@ -152,7 +152,7 @@ const TimeFormat = "2006-01-02T15:04"
 // validateName ensures that the name is a valid format.
 func validateName(name string) error {
 	if !nameRegexp.Match([]byte(name)) {
-		return ErrName
+		return errors.Wrapf(ErrName, "'%s'", name)
 	}
 	return nil
 }