diff --git a/client.go b/client.go
index 72225aef2..0575b838b 100644
--- a/client.go
+++ b/client.go
@@ -1111,6 +1111,9 @@ func (c *InternalHTTPClient) SendMessage(ctx context.Context, uri *URI, pb proto
 
 	u := uriPathToURL(uri, "/cluster/message")
 	req, err := http.NewRequest("POST", u.String(), bytes.NewReader(msg))
+	if err != nil {
+		return errors.Wrap(err, "making new request")
+	}
 	req.Header.Set("Content-Type", "application/x-protobuf")
 	req.Header.Set("User-Agent", "pilosa/"+Version)
 
diff --git a/diagnostics.go b/diagnostics.go
index 46ffc2110..9219c01ea 100644
--- a/diagnostics.go
+++ b/diagnostics.go
@@ -85,6 +85,9 @@ func (d *DiagnosticsCollector) Flush() error {
 		return errors.Wrap(err, "encoding")
 	}
 	req, err := http.NewRequest("POST", d.host, bytes.NewReader(buf))
+	if err != nil {
+		return errors.Wrap(err, "making new request")
+	}
 	req.Header.Set("Content-Type", "application/json")
 	resp, err := d.client.Do(req)
 	if err != nil {
@@ -99,6 +102,9 @@ func (d *DiagnosticsCollector) Flush() error {
 func (d *DiagnosticsCollector) CheckVersion() error {
 	var rsp versionResponse
 	req, err := http.NewRequest("GET", d.VersionURL, nil)
+	if err != nil {
+		return errors.Wrap(err, "making request")
+	}
 	resp, err := d.client.Do(req)
 	if err != nil {
 		return errors.Wrap(err, "getting version")
diff --git a/handler_test.go b/handler_test.go
index 2d438e72a..9e947805c 100644
--- a/handler_test.go
+++ b/handler_test.go
@@ -1076,6 +1076,9 @@ func TestHandler_Frame_GetFields(t *testing.T) {
 	t.Run("ErrFrameFieldNotAllowed", func(t *testing.T) {
 		idx := hldr.MustCreateIndexIfNotExists("i", pilosa.IndexOptions{})
 		_, err := idx.CreateFrameIfNotExists("f1", pilosa.FrameOptions{})
+		if err != nil {
+			t.Fatalf("creating frame: %v", err)
+		}
 
 		resp, err := http.Get(s.URL + "/index/i/frame/f1/fields")
 		if err != nil {
diff --git a/index_test.go b/index_test.go
index ac90d0ac7..a83fb7609 100644
--- a/index_test.go
+++ b/index_test.go
@@ -249,6 +249,9 @@ func TestIndex_InvalidName(t *testing.T) {
 		panic(err)
 	}
 	index, err := pilosa.NewIndex(path, "ABC")
+	if err == nil {
+		t.Fatalf("should have gotten an error on index name with caps")
+	}
 	if index != nil {
 		t.Fatalf("unexpected index name %v", index)
 	}