diff --git a/go/libraries/doltcore/table/editor/pk_table_editor.go b/go/libraries/doltcore/table/editor/pk_table_editor.go
index 2317230151..f013659629 100644
--- a/go/libraries/doltcore/table/editor/pk_table_editor.go
+++ b/go/libraries/doltcore/table/editor/pk_table_editor.go
@@ -307,6 +307,10 @@ func GetIndexedRows(ctx context.Context, te TableEditor, key types.Tuple, indexN
 		}
 
 		tableRow, err := row.FromNoms(te.Schema(), pkTupleVal.(types.Tuple), fieldsVal.(types.Tuple))
+		if err != nil {
+			return nil, err
+		}
+
 		rows = append(rows, tableRow)
 	}
 
diff --git a/go/libraries/doltcore/table/typed/json/writer.go b/go/libraries/doltcore/table/typed/json/writer.go
index d7bb98a51d..34c2a1ecdf 100644
--- a/go/libraries/doltcore/table/typed/json/writer.go
+++ b/go/libraries/doltcore/table/typed/json/writer.go
@@ -77,7 +77,7 @@ func (jsonw *JSONWriter) GetSchema() schema.Schema {
 func (jsonw *JSONWriter) WriteRow(ctx context.Context, r row.Row) error {
 	allCols := jsonw.sch.GetAllCols()
 	colValMap := make(map[string]interface{}, allCols.Size())
-	err := allCols.Iter(func(tag uint64, col schema.Column) (stop bool, err error) {
+	if err := allCols.Iter(func(tag uint64, col schema.Column) (stop bool, err error) {
 		val, ok := r.GetColVal(tag)
 		if !ok || types.IsNull(val) {
 			return false, nil
@@ -112,7 +112,9 @@ func (jsonw *JSONWriter) WriteRow(ctx context.Context, r row.Row) error {
 		colValMap[col.Name] = val
 
 		return false, nil
-	})
+	}); err != nil {
+		return err
+	}
 
 	data, err := marshalToJson(colValMap)
 	if err != nil {