[Finishes #70871986] clean handling of null for numberValidator