check for null
Merge pull request #42 from Politiken/did-not-merge-properly-will-try-this

check for null