Preventing null-pointer derefs
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fix for the parser.

    See the unit tests.
Merge pull request #251 from pieterhijma/master

Preventing null-pointer derefs