Make sure we do not have None in old_value or it can not be changed to a 'Set'