Fix null address edge case