diff --git a/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java b/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java
index 36ae7abb54274fa717b06109e22bd0bbf82b5a44..1ce39f84be89c9de640fbd791ff103417be68e18 100644
--- a/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java
+++ b/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java
@@ -151,11 +151,7 @@ public class RemoteClusterManager implements ClusterMonitoringService {
                                 .state(KClusterState.UNKNOWN)
                                 .contactEmail(view.getContactEmail())
                                 .currentStateSince(OffsetDateTime.now())
-                                .domains(!view.getDomainNames().isEmpty() ? view.getDomainNames().stream().map(d -> {
-                                            Optional<Domain> dom = domainService.findDomain(d);
-                                            return dom.orElse(null);
-                                        }
-                                ).toList() : Collections.emptyList())
+                                .domains(prepareList(view))
                                 .build(),
                         file);
 
@@ -170,6 +166,17 @@ public class RemoteClusterManager implements ClusterMonitoringService {
         return null;
     }
 
+    private List<Domain> prepareList(RemoteClusterView view) {
+        if (view == null || view.getDomainNames() == null) {
+            return Collections.emptyList();
+        }
+        return view.getDomainNames().stream().map(d -> {
+                    Optional<Domain> dom = domainService.findDomain(d);
+                    return dom.orElse(null);
+                }
+        ).toList();
+    }
+
     public RemoteClusterView updateCluster(RemoteClusterView cluster, Long id) {
         Optional<KCluster> entity = clusterRepository.findById(id);
 
@@ -332,7 +339,7 @@ public class RemoteClusterManager implements ClusterMonitoringService {
 
     public void removeCluster(Long id) {
         try {
-            if(clusterRepository.existsById(id)) {
+            if (clusterRepository.existsById(id)) {
                 this.clusterRepository.deleteById(id);
             }
         } catch (RuntimeException ex) {