Consider adding an address(0) check here:
