TIMOB-15734: Move isNull() check after isFloat() so we error out appropriately.
Merge pull request #4986 from ayeung/timob-15734

TIMOB-15734: Move isNull() check after isFloat() so we error out appropriately