1 files changed, 7 insertions, 5 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
index 25ed3ec4b59..98975dddb56 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
@@ -138,11 +138,13 @@ public class NodeAgentImpl implements NodeAgent {
         this.healthChecker = healthChecker;
 
         this.loopThread = new Thread(() -> {
-            try {
-                while (!terminated.get()) tick();
-            } catch (Throwable t) {
-                numberOfUnhandledException++;
-                context.log(logger, LogLevel.ERROR, "Unhandled throwable, ignoring", t);
+            while (!terminated.get()) {
+                try {
+                    tick();
+                } catch (Throwable t) {
+                    numberOfUnhandledException++;
+                    context.log(logger, LogLevel.ERROR, "Unhandled throwable, ignoring", t);
+                }
             }
         });
         this.loopThread.setName("tick-" + context.hostname());