Work on handling bad servers