Correctly check address for null
Merge pull request #35 from ahinz/bug/silly-address

Correctly check address for null