Disconnection scenario errors fix