Added case when OptionSet is null