Fix for crash defect during teardown in concurrency refactor.