Fix transaction error argument assumption
Merge branch 'fix-transaction-arguments'