Better detection of disconnection