Added a timeout check to subscribe-and-wait for when the server dies.