From 9cdd10aeb2b3ce4c8cbc042ddc3e571d0357114f Mon Sep 17 00:00:00 2001
From: moremagic <itoumagic@gmail.com>
Date: Fri, 30 Sep 2022 18:28:54 +0900
Subject: [PATCH] Add null check

---
 src/main/java/org/akhq/models/Cluster.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/akhq/models/Cluster.java b/src/main/java/org/akhq/models/Cluster.java
index 428c3ba39..8f51166c2 100644
--- a/src/main/java/org/akhq/models/Cluster.java
+++ b/src/main/java/org/akhq/models/Cluster.java
@@ -8,6 +8,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 
 @ToString
@@ -25,6 +26,8 @@ public Cluster(DescribeClusterResult result) throws ExecutionException, Interrup
             this.nodes.add(new Node(node));
         }
 
-        this.controller = new Node(result.controller().get());
+        Optional.ofNullable(result.controller().get()).ifPresentOrElse(
+            node -> this.controller = new Node(node),
+            () -> this.controller = new Node());
     }
 }