Handle null addresses
Merge pull request #132 from OpenTreeMap/topic/handle-null-addresses

Handle null addresses