Fixed #20587 -- Made convert_values handle None values