Fix getValues with nulls