Fix in issue where no servers are to be found (introduced in last refactoring)