JC-1335 Validation errors fix.