#887 - adding null check in the case the payment does not contain a billing address