diff --git a/http/handler.go b/http/handler.go
index 0d52a270b..8e932271a 100644
--- a/http/handler.go
+++ b/http/handler.go
@@ -782,11 +782,9 @@ func (h *Handler) handlePostField(w http.ResponseWriter, r *http.Request) {
 	}
 
 	_, err = h.api.CreateField(r.Context(), indexName, fieldName, fos...)
-	if err != nil {
-		if _, ok := err.(pilosa.BadRequestError); ok {
-			http.Error(w, err.Error(), http.StatusBadRequest)
-			return
-		}
+	if _, ok := err.(pilosa.BadRequestError); ok {
+		http.Error(w, err.Error(), http.StatusBadRequest)
+		return
 	}
 	resp.write(w, err)
 }
diff --git a/server/handler_test.go b/server/handler_test.go
index dc4f571d5..c830c94d7 100644
--- a/server/handler_test.go
+++ b/server/handler_test.go
@@ -557,7 +557,7 @@ func TestHandler_Endpoints(t *testing.T) {
 			t.Fatalf("unexpected status code: %d", w.Code)
 		}
 		rsp := getSchemaResponse{}
-		if err := json.Unmarshal([]byte(w.Body.String()), &rsp); err != nil {
+		if err := json.Unmarshal(w.Body.Bytes(), &rsp); err != nil {
 			t.Fatalf("json decode: %s", err)
 		}
 		field := rsp.findField("i0", fieldName)
@@ -586,7 +586,7 @@ func TestHandler_Endpoints(t *testing.T) {
 			t.Fatalf("unexpected status code: %d", w.Code)
 		}
 		rsp := getSchemaResponse{}
-		if err := json.Unmarshal([]byte(w.Body.String()), &rsp); err != nil {
+		if err := json.Unmarshal(w.Body.Bytes(), &rsp); err != nil {
 			t.Fatalf("json decode: %s", err)
 		}
 		field := rsp.findField("i0", fieldName)
@@ -615,7 +615,7 @@ func TestHandler_Endpoints(t *testing.T) {
 			t.Fatalf("unexpected status code: %d", w.Code)
 		}
 		rsp := getSchemaResponse{}
-		if err := json.Unmarshal([]byte(w.Body.String()), &rsp); err != nil {
+		if err := json.Unmarshal(w.Body.Bytes(), &rsp); err != nil {
 			t.Fatalf("json decode: %s", err)
 		}
 		field := rsp.findField("i0", fieldName)