Fix null
Merge pull request #1874 from andreasnoackjensen/fixnull

Fix null