Added:
Added null-pointer check in two getAddress-methods, which caused crashes
when cotnext was null.