killbill-aplcache

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BusinessInvoicePaymentJson.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BusinessInvoicePaymentJson.java
index d71d858..1d9247c 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BusinessInvoicePaymentJson.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BusinessInvoicePaymentJson.java
@@ -101,9 +101,9 @@ public class BusinessInvoicePaymentJson extends JsonBase {
              businessInvoicePayment.getPaymentType(),
              businessInvoicePayment.getPaymentMethod(),
              businessInvoicePayment.getCardType(),
+             businessInvoicePayment.getCardCountry(),
              businessInvoicePayment.getInvoicePaymentType(),
-             businessInvoicePayment.getInvoicePaymentType(),
-             businessInvoicePayment.getLinkedInvoicePaymentId().toString());
+             businessInvoicePayment.getLinkedInvoicePaymentId() == null ? null : businessInvoicePayment.getLinkedInvoicePaymentId().toString());
     }
 
     public String getPaymentId() {