[DF-4580] improved validation