Minor cleanup
Fix possible null-pointer exception on wrong ivoaids