Handle host failue more gracefully