Fixed handling of missing dataset fields.