Check for null to avoid issue #848
Merge pull request #849 from jacquerie/master

Check for null to avoid issue #848