Fix EnterpriseClient

Now consistent and robust to server down