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

ND2: prevent NumberFormatExceptions when parsing text data