Fix possible NPE in address handling.