Merge pull request #1169 from etimberg/fix/skip-data-type

Only skip when the data is null, not when it is not a number