Bug fixed - resolved case when server is not avai