Prevent NPE caused by previous commit
Prevent NPE caused by previous commit

validator/validator,tripu/validator,tripu/validator,takenspc/validator,tripu/validator,tripu/validator,validator/validator,takenspc/validator,validator/validator,takenspc/validator,takenspc/validator,takenspc/validator,tripu/validator,validator/validator,validator/validator