Disconnect is now more fault-tolerant.