diff --git a/abci/types/mocks/base.go b/abci/types/mocks/base.go
index 4c76148f3..db25cfe29 100644
--- a/abci/types/mocks/base.go
+++ b/abci/types/mocks/base.go
@@ -78,14 +78,14 @@ func (m baseMock) PrepareProposal(input types.RequestPrepareProposal) types.Resp
 }
 
 func (m baseMock) ProcessProposal(input types.RequestProcessProposal) types.ResponseProcessProposal {
-	var r types.ResponseProcessProposal
+	var ret types.ResponseProcessProposal
 	defer func() {
 		if r := recover(); r != nil {
-			r = m.base.ProcessProposal(input)
+			ret = m.base.ProcessProposal(input)
 		}
 	}()
-	r = m.Application.ProcessProposal(input)
-	return r
+	ret = m.Application.ProcessProposal(input)
+	return ret
 }
 
 // Commit the state and return the application Merkle root hash
diff --git a/internal/state/execution_test.go b/internal/state/execution_test.go
index 74b056606..ea0f4cf4c 100644
--- a/internal/state/execution_test.go
+++ b/internal/state/execution_test.go
@@ -268,6 +268,7 @@ func TestProcessProposal(t *testing.T) {
 	)
 
 	block0, err := sf.MakeBlock(state, int64(height-1), new(types.Commit))
+	require.NoError(t, err)
 	lastCommitSig := []types.CommitSig{}
 	partSet, err := block0.MakePartSet(types.BlockPartSizeBytes)
 	require.NoError(t, err)
@@ -275,6 +276,7 @@ func TestProcessProposal(t *testing.T) {
 	voteInfos := []abci.VoteInfo{}
 	for _, privVal := range privVals {
 		vote, err := factory.MakeVote(ctx, privVal, block0.Header.ChainID, 0, 0, 0, 2, blockID, time.Now())
+		require.NoError(t, err)
 		pk, err := privVal.GetPubKey(ctx)
 		require.NoError(t, err)
 		addr := pk.Address()