PMO-2838: improved validation