diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryOperationCallback.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryOperationCallback.java
index dcad8a0..a2d01b9 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryOperationCallback.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryOperationCallback.java
@@ -188,7 +188,10 @@ public abstract class RetryOperationCallback extends OperationCallbackBase<Payme
}
}
- private final void adjustStateContextValues(final PaymentStateContext inputContext, final PriorPaymentRoutingResult pluginResult) {
+ private void adjustStateContextValues(final PaymentStateContext inputContext, @Nullable final PriorPaymentRoutingResult pluginResult) {
+ if (pluginResult == null) {
+ return;
+ }
final RetryablePaymentStateContext input = (RetryablePaymentStateContext) inputContext;
if (pluginResult.getAdjustedAmount() != null) {