1 files changed, 4 insertions, 2 deletions
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSupervision.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSupervision.java
index f90d462e..177778b8 100644
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSupervision.java
+++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSupervision.java
@@ -109,6 +109,7 @@ public class RicSupervision {
     private Flux<RicData> createTask() {
         return Flux.fromIterable(rics.getRics()) //
                 .flatMap(this::createRicData) //
+                .onErrorResume(t -> Flux.empty()) //
                 .flatMap(this::checkOneRic, CONCURRENCY);
     }
 
@@ -153,8 +154,9 @@ public class RicSupervision {
     }
 
     private Mono<RicData> createRicData(Ric ric) {
-        return Mono.just(ric) //
-                .flatMap(aRic -> this.a1ClientFactory.createA1Client(ric)) //
+        return this.a1ClientFactory.createA1Client(ric) //
+                .doOnError(t -> logger.debug("Could not create A1 client for ric: {}, reason: {}", ric.id(),
+                        t.getMessage())) //
                 .map(a1Client -> new RicData(ric, a1Client));
     }