Fix null in logging when there is no billing address