DS-685: adding validation check