adding missing validations - #15661506405826