Added better handling of connectivity issue