Fixed #22224 -- Non-nullable empty string based fields handling of `None`

Those fields shouldn't consider `None` as an empty value.