make safeCreateOptionValue more robust and prevent changing values of existing OptionValues;