Temporary workaround for unhandled operations being added during thread shutdown