killbill-memoizeit

diff --git a/payment/src/main/java/org/killbill/billing/payment/bus/PaymentBusEventHandler.java b/payment/src/main/java/org/killbill/billing/payment/bus/PaymentBusEventHandler.java
index a9b940b..b58975c 100644
--- a/payment/src/main/java/org/killbill/billing/payment/bus/PaymentBusEventHandler.java
+++ b/payment/src/main/java/org/killbill/billing/payment/bus/PaymentBusEventHandler.java
@@ -76,11 +76,7 @@ public class PaymentBusEventHandler {
     @AllowConcurrentEvents
     @Subscribe
     public void processPaymentEvent(final PaymentInternalEvent event) {
-        try {
             janitor.processPaymentEvent(event);
-        } catch (IOException e) {
-            log.error("Failed to process payment event {}", e.toString());
-        }
     }
 
     @AllowConcurrentEvents

diff --git a/payment/src/main/java/org/killbill/billing/payment/core/janitor/IncompletePaymentAttemptTask.java b/payment/src/main/java/org/killbill/billing/payment/core/janitor/IncompletePaymentAttemptTask.java
index d39f831..01a9101 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/janitor/IncompletePaymentAttemptTask.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/janitor/IncompletePaymentAttemptTask.java
@@ -146,7 +146,7 @@ public class IncompletePaymentAttemptTask extends CompletionTaskBase<PaymentAtte
     }
 
     @Override
-    public void processPaymentEvent(final PaymentInternalEvent event, final NotificationQueue janitorQueue) throws IOException {
+    public void processPaymentEvent(final PaymentInternalEvent event, final NotificationQueue janitorQueue) {
         // Nothing
     }
 

diff --git a/payment/src/main/java/org/killbill/billing/payment/core/janitor/IncompletePaymentTransactionTask.java b/payment/src/main/java/org/killbill/billing/payment/core/janitor/IncompletePaymentTransactionTask.java
index 99d4725..201eddd 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/janitor/IncompletePaymentTransactionTask.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/janitor/IncompletePaymentTransactionTask.java
@@ -151,7 +151,7 @@ public class IncompletePaymentTransactionTask extends CompletionTaskBase<Payment
     }
 
     @Override
-    public void processPaymentEvent(final PaymentInternalEvent event, final NotificationQueue janitorQueue) throws IOException {
+    public void processPaymentEvent(final PaymentInternalEvent event, final NotificationQueue janitorQueue) {
         if (!TRANSACTION_STATUSES_TO_CONSIDER.contains(event.getStatus())) {
             return;
         }
@@ -261,6 +261,7 @@ public class IncompletePaymentTransactionTask extends CompletionTaskBase<Payment
     private void insertNewNotificationForUnresolvedTransactionIfNeeded(final UUID paymentTransactionId, @Nullable final Integer attemptNumber, @Nullable final UUID userToken, final Long accountRecordId, final Long tenantRecordId) {
         final NotificationEvent key = new JanitorNotificationKey(paymentTransactionId, IncompletePaymentTransactionTask.class.toString(), attemptNumber);
         final DateTime notificationTime = getNextNotificationTime(attemptNumber);
+        // Will be null in the GET path or when we run out opf attempts..
         if (notificationTime != null) {
             try {
                 janitorQueue.recordFutureNotification(notificationTime, key, userToken, accountRecordId, tenantRecordId);

diff --git a/payment/src/main/java/org/killbill/billing/payment/core/janitor/Janitor.java b/payment/src/main/java/org/killbill/billing/payment/core/janitor/Janitor.java
index 8ca2037..95c0be3 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/janitor/Janitor.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/janitor/Janitor.java
@@ -153,7 +153,7 @@ public class Janitor {
         }
     }
 
-    public void processPaymentEvent(final PaymentInternalEvent event) throws IOException {
+    public void processPaymentEvent(final PaymentInternalEvent event) {
         incompletePaymentAttemptTask.processPaymentEvent(event, janitorQueue);
         incompletePaymentTransactionTask.processPaymentEvent(event, janitorQueue);
     }