CRM-13725 This should cover the case of missing custom fields.