diff --git a/queue-based-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/ServiceExecutor.java b/queue-based-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/ServiceExecutor.java
index 0a8f1b5a7642..5a890b94bd52 100644
--- a/queue-based-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/ServiceExecutor.java
+++ b/queue-based-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/ServiceExecutor.java
@@ -40,21 +40,17 @@ public ServiceExecutor(MessageQueue msgQueue) {
   }
 
   /** The ServiceExecutor thread will retrieve each message and process it. */
+  @Override
+
   public void run() {
     try {
       while (!Thread.currentThread().isInterrupted()) {
-        var msg = msgQueue.retrieveMsg();
-
-        if (null != msg) {
-          LOGGER.info(msg + " is served.");
-        } else {
-          LOGGER.info("Service Executor: Waiting for Messages to serve .. ");
-        }
-
-        Thread.sleep(1000);
+        var msg = msgQueue.retrieveMsg(); // blocks internally
+        LOGGER.info(msg + " is served.");
       }
     } catch (Exception e) {
-      LOGGER.error(e.getMessage());
+      Thread.currentThread().interrupt();
+      LOGGER.error("Error while processing message", e);
     }
   }
 }