Bug fix: the address can be null, treating that case