Re-organise validation errors