diff --git a/orm/model/ormdb/module_test.go b/orm/model/ormdb/module_test.go
index 204cfb30fe..71ca0a167f 100644
--- a/orm/model/ormdb/module_test.go
+++ b/orm/model/ormdb/module_test.go
@@ -278,6 +278,7 @@ func runSimpleBankTests(t *testing.T, k Keeper, ctx context.Context) {
 	// send coins
 	acct2 := "sally"
 	err = k.Send(ctx, acct1, acct2, denom, 30)
+	assert.NilError(t, err)
 	bal, err = k.Balance(ctx, acct1, denom)
 	assert.NilError(t, err)
 	assert.Equal(t, uint64(70), bal)
@@ -287,6 +288,7 @@ func runSimpleBankTests(t *testing.T, k Keeper, ctx context.Context) {
 
 	// burn coins
 	err = k.Burn(ctx, acct2, denom, 3)
+	assert.NilError(t, err)
 	bal, err = k.Balance(ctx, acct2, denom)
 	assert.NilError(t, err)
 	assert.Equal(t, uint64(27), bal)
diff --git a/orm/model/ormtable/table_impl.go b/orm/model/ormtable/table_impl.go
index b0d77ccf7c..bbcebb3a96 100644
--- a/orm/model/ormtable/table_impl.go
+++ b/orm/model/ormtable/table_impl.go
@@ -122,6 +122,9 @@ func (t tableImpl) doSave(ctx context.Context, writer *batchIndexCommitmentWrite
 
 	// store object
 	bz, err := proto.MarshalOptions{Deterministic: true}.Marshal(message)
+	if err != nil {
+		return err
+	}
 	err = writer.CommitmentStore().Set(pk, bz)
 	if err != nil {
 		return err
diff --git a/orm/model/ormtable/table_test.go b/orm/model/ormtable/table_test.go
index 2a094eeaac..8e62cf8143 100644
--- a/orm/model/ormtable/table_test.go
+++ b/orm/model/ormtable/table_test.go
@@ -74,6 +74,7 @@ func TestPaginationLimitCountTotal(t *testing.T) {
 	table, err := ormtable.Build(ormtable.Options{
 		MessageType: (&testpb.ExampleTable{}).ProtoReflect().Type(),
 	})
+	assert.NilError(t, err)
 	backend := testkv.NewSplitMemBackend()
 	ctx := ormtable.WrapContextDefault(backend)
 	store, err := testpb.NewExampleTableTable(table)
@@ -104,6 +105,7 @@ func TestTimestampIndex(t *testing.T) {
 	table, err := ormtable.Build(ormtable.Options{
 		MessageType: (&testpb.ExampleTimestamp{}).ProtoReflect().Type(),
 	})
+	assert.NilError(t, err)
 	backend := testkv.NewDebugBackend(testkv.NewSplitMemBackend(), &testkv.EntryCodecDebugger{
 		EntryCodec: table,
 		Print: func(s string) {
@@ -157,6 +159,7 @@ func TestTimestampIndex(t *testing.T) {
 	assert.NilError(t, err)
 
 	res, err := store.Get(ctx, id)
+	assert.NilError(t, err)
 	assert.Assert(t, res.Ts == nil)
 
 	it, err = store.List(ctx, testpb.ExampleTimestampTsIndexKey{})
@@ -200,6 +203,7 @@ func checkEncodeDecodeEntries(t *testing.T, table ormtable.Table, store kv.Reado
 		entry, err := table.DecodeEntry(key, value)
 		assert.NilError(t, err)
 		k, v, err := table.EncodeEntry(entry)
+		assert.NilError(t, err)
 		assert.Assert(t, bytes.Equal(key, k), "%x %x %s", key, k, entry)
 		assert.Assert(t, bytes.Equal(value, v), "%x %x %s", value, v, entry)
 		it.Next()
@@ -209,6 +213,7 @@ func checkEncodeDecodeEntries(t *testing.T, table ormtable.Table, store kv.Reado
 func runTestScenario(t *testing.T, table ormtable.Table, backend ormtable.Backend) {
 	ctx := ormtable.WrapContextDefault(backend)
 	store, err := testpb.NewExampleTableTable(table)
+	assert.NilError(t, err)
 
 	// let's create 10 data items we'll use later and give them indexes
 	data := []*testpb.ExampleTable{
@@ -240,6 +245,7 @@ func runTestScenario(t *testing.T, table ormtable.Table, backend ormtable.Backen
 
 	// insert one record
 	err = store.Insert(ctx, data[0])
+	assert.NilError(t, err)
 	// trivial prefix query has one record
 	it, err := store.List(ctx, testpb.ExampleTablePrimaryKey{})
 	assert.NilError(t, err)
@@ -247,6 +253,7 @@ func runTestScenario(t *testing.T, table ormtable.Table, backend ormtable.Backen
 
 	// insert one record
 	err = store.Insert(ctx, data[1])
+	assert.NilError(t, err)
 	// trivial prefix query has two records
 	it, err = store.List(ctx, testpb.ExampleTablePrimaryKey{})
 	assert.NilError(t, err)
@@ -296,6 +303,7 @@ func runTestScenario(t *testing.T, table ormtable.Table, backend ormtable.Backen
 		testpb.ExampleTableStrU32IndexKey{}.WithStr("abd"),
 		ormlist.Reverse(),
 	)
+	assert.NilError(t, err)
 	assertIteratorItems(it, 9, 3, 1, 8, 7, 2, 0)
 
 	// another prefix query forwards
@@ -303,12 +311,14 @@ func runTestScenario(t *testing.T, table ormtable.Table, backend ormtable.Backen
 	it, err = store.List(ctx,
 		testpb.ExampleTableStrU32IndexKey{}.WithStrU32("abe", 7),
 	)
+	assert.NilError(t, err)
 	assertIteratorItems(it, 5, 6)
 	// and backwards
 	it, err = store.List(ctx,
 		testpb.ExampleTableStrU32IndexKey{}.WithStrU32("abc", 4),
 		ormlist.Reverse(),
 	)
+	assert.NilError(t, err)
 	assertIteratorItems(it, 2, 0)
 
 	// try filtering
@@ -838,6 +848,7 @@ func TestInsertReturningFieldName(t *testing.T) {
 	table, err := ormtable.Build(ormtable.Options{
 		MessageType: (&testpb.ExampleAutoIncFieldName{}).ProtoReflect().Type(),
 	})
+	assert.NilError(t, err)
 	backend := testkv.NewSplitMemBackend()
 	ctx := ormtable.WrapContextDefault(backend)
 	store, err := testpb.NewExampleAutoIncFieldNameTable(table)