Better error handling for rollback.