(PDB-722) Optimized validation fn as suggested in PR