Protect more values with or_null