Added client error catching when no server is available,
It will wait now