Quick and Dirty fix to force the client to wait for the server to be available