Fix
Addressed an issue where rollback would fail when no teardown was required.