Update the detach logic to deal with ephemeral detachement failures.