Fix to allow for null values in a lookup table