The current implementation add the server too early and doesn't take into account the readiness of the server.