[16] Improve validator messages