Fixed parsing null.

closes #1608
Merge branch 'origin/master'