Improved CheckDisconnect to be just a bit more agressive