Errors, errors everywhere (but not necessarily my errors)

Fixes

• Issue #1: Avoid removing the unit of work twice when an error during the CommitAsync happens