Fix issue with RecordTypeId field potentially not existing