LPS-37741 Changed condition checking to use new Validator methods