diff --git a/cmd/workload/filtertestgen.go b/cmd/workload/filtertestgen.go
index 603e3dea67..b7bd9192db 100644
--- a/cmd/workload/filtertestgen.go
+++ b/cmd/workload/filtertestgen.go
@@ -355,7 +355,9 @@ func (s *filterTestGen) writeQueries() {
 		exit(fmt.Errorf("Error creating filter test query file %s: %v", s.queryFile, err))
 		return
 	}
-	json.NewEncoder(file).Encode(&s.queries)
+	if err := json.NewEncoder(file).Encode(&s.queries); err != nil {
+		exit(fmt.Errorf("Error writing filter test query file %s: %v", s.queryFile, err))
+	}
 	file.Close()
 }
 
diff --git a/cmd/workload/filtertestperf.go b/cmd/workload/filtertestperf.go
index d4f1a155f1..fa2f13955d 100644
--- a/cmd/workload/filtertestperf.go
+++ b/cmd/workload/filtertestperf.go
@@ -160,5 +160,7 @@ func writeErrors(errorFile string, errors []*filterQuery) {
 		return
 	}
 	defer file.Close()
-	json.NewEncoder(file).Encode(errors)
+	if err := json.NewEncoder(file).Encode(errors); err != nil {
+		exit(fmt.Errorf("Error writing filter error file %s: %v", errorFile, err))
+	}
 }
diff --git a/cmd/workload/historytestgen.go b/cmd/workload/historytestgen.go
index b88c8208da..205364313c 100644
--- a/cmd/workload/historytestgen.go
+++ b/cmd/workload/historytestgen.go
@@ -150,5 +150,7 @@ func writeJSON(fileName string, value any) {
 	}
 	defer file.Close()
 
-	json.NewEncoder(file).Encode(value)
+	if err := json.NewEncoder(file).Encode(value); err != nil {
+		exit(fmt.Errorf("error writing %s: %v", fileName, err))
+	}
 }