diff --git a/client/fingerprint/env_aws.go b/client/fingerprint/env_aws.go
index 338d6d1cb..53a32ec8f 100644
--- a/client/fingerprint/env_aws.go
+++ b/client/fingerprint/env_aws.go
@@ -209,7 +209,7 @@ func (f *EnvAWSFingerprint) isAWS() bool {
 	}
 
 	match, err := regexp.MatchString("ami-*", string(instanceID))
-	if !match {
+	if err != nil || !match {
 		return false
 	}
 
diff --git a/client/fingerprint/env_gce.go b/client/fingerprint/env_gce.go
index fa74d6a96..6f83ed224 100644
--- a/client/fingerprint/env_gce.go
+++ b/client/fingerprint/env_gce.go
@@ -262,7 +262,7 @@ func (f *EnvGCEFingerprint) isGCE() bool {
 	}
 
 	match, err := regexp.MatchString("projects/.+/machineTypes/.+", machineType)
-	if !match {
+	if err != nil || !match {
 		return false
 	}
 
diff --git a/command/agent/fs_endpoint.go b/command/agent/fs_endpoint.go
index eab245eb3..ee04a3f70 100644
--- a/command/agent/fs_endpoint.go
+++ b/command/agent/fs_endpoint.go
@@ -123,6 +123,9 @@ func (s *HTTPServer) FileCatRequest(resp http.ResponseWriter, req *http.Request)
 	}
 
 	r, err := fs.ReadAt(path, int64(0), fileInfo.Size)
+	if err != nil {
+		return nil, err
+	}
 	io.Copy(resp, r)
 	return nil, nil
 }
diff --git a/nomad/state/state_store_test.go b/nomad/state/state_store_test.go
index dcdd13571..55c510b2b 100644
--- a/nomad/state/state_store_test.go
+++ b/nomad/state/state_store_test.go
@@ -586,6 +586,9 @@ func TestStateStore_JobsByPeriodic(t *testing.T) {
 	}
 
 	iter, err = state.JobsByPeriodic(false)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
 
 	var outNonPeriodic []*structs.Job
 	for {