Changed custom address to check for null specifically