[case 8945] Beautified validation