From ae11ad22834f42faef465eed7a4bfabd941c8a87 Mon Sep 17 00:00:00 2001
From: Alessio Cialini <alessio.cialini@emeal.nttdata.com>
Date: Wed, 25 Sep 2024 18:04:04 +0200
Subject: [PATCH] Updated PaymentOptionsService

---
 .../payment/options/services/PaymentOptionsService.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/it/gov/pagopa/payment/options/services/PaymentOptionsService.java b/src/main/java/it/gov/pagopa/payment/options/services/PaymentOptionsService.java
index 60e4787..b0176a5 100644
--- a/src/main/java/it/gov/pagopa/payment/options/services/PaymentOptionsService.java
+++ b/src/main/java/it/gov/pagopa/payment/options/services/PaymentOptionsService.java
@@ -297,7 +297,9 @@ private static StationCreditorInstitution getStationCreditorInstitution(String i
 
     return stationCreditorInstitutionMap.values()
         .stream().filter(item ->
-            item.getSegregationCode().equals(segregationCode) &&
+            item.getSegregationCode() != null &&
+                item.getSegregationCode().equals(segregationCode) &&
+            item.getCreditorInstitutionCode() != null &&
                 item.getCreditorInstitutionCode()
                     .equals(creditorInstitution.getCreditorInstitutionCode()))
         .findFirst().orElseThrow(() ->