ND2: prevent NumberFormatExceptions when parsing text data
Merge pull request #1335 from melissalinkert/rebased/develop/ticket-12536

ND2: prevent NumberFormatExceptions when parsing text data (rebased onto develop)