Improved transaction error handling.
Merge branch 'barnacle'