Fixes handling of isNaN and null for Numeric input

WM-4860, WM-3991