Merge "fix issue where we attempt audit with no servers"