Bid old refactoring of the cross-cut of transactions, error handling and wrapping.