Be better about disconnect errors