Fix NPE in validation mechanism
Minor text change in validation mechanism