Added a mecanism to wait for server even if they are not connected.