Additions to the async operation catching patch.