Fix null
Merge pull request #727 from Zahnstocher/null-fix-patch

Fix null