make update-server-info more robust