Line 173 has added code to take care of the NULL values for the address, but does not register the hardcoded values.