Better validation of 'Service catalog' / 'Device environment' fields.