killbill-uncached

diff --git a/analytics/src/main/java/com/ning/billing/analytics/BusinessInvoicePaymentDao.java b/analytics/src/main/java/com/ning/billing/analytics/BusinessInvoicePaymentDao.java
index 2758f3f..4de765d 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/BusinessInvoicePaymentDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/BusinessInvoicePaymentDao.java
@@ -167,7 +167,7 @@ public class BusinessInvoicePaymentDao {
                 payment.getId(),
                 paymentMethodString,
                 "Electronic",
-                paymentMethod.getPluginName(),
+                paymentMethod == null ? null : paymentMethod.getPluginName(),
                 payment.getPaymentStatus().toString(),
                 payment.getAmount(),
                 updatedDate,

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentModelDao.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentModelDao.java
index ed5b2a0..5f646d6 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentModelDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentModelDao.java
@@ -52,7 +52,7 @@ public class BusinessInvoicePaymentModelDao extends EntityBase {
                                           final String cardCountry, final String cardType, final DateTime createdDate,
                                           final Currency currency, final DateTime effectiveDate, final UUID invoiceId,
                                           final String paymentError, final UUID paymentId, final String paymentMethod,
-                                          final String paymentType, final String pluginName, final String processingStatus,
+                                          final String paymentType, @Nullable final String pluginName, final String processingStatus,
                                           final BigDecimal requestedAmount, final DateTime updatedDate, @Nullable final String invoicePaymentType,
                                           @Nullable final UUID linkedInvoicePaymentId) {
         super(paymentId, createdDate, updatedDate);