Improved on fault tolerance for disconnecting.