Validator Changes fix NPE in validator around Extension context Handle secondary terminology server errors properly Other code changes no changes