HPSA-51 add some validations