Improved data checking when adding a new server