Improved handling of bad servers.