Disconnect errors fix