Prevent NPE when highlight field names is null

Hey Mike, this pull adss defensive code to avoid NPE discovered on tests. Could you please review it? Thanks\!