Make non-exception rollback() calls safer