diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgProcessingCtx.java b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgProcessingCtx.java
index 51cad0976f..4e25ae17dc 100644
--- a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgProcessingCtx.java
+++ b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgProcessingCtx.java
@@ -64,12 +64,7 @@ public final class TbMsgProcessingCtx implements Serializable {
     }
 
     public TbMsgProcessingStackItem pop() {
-        if (stack == null) {
-            throw new RuntimeException("Stack is null!");
-        } else if (stack.isEmpty()) {
-            return null;
-        }
-        return stack.removeLast();
+        return stack == null || stack.isEmpty() ? null : stack.removeLast();
     }
 
     public static TbMsgProcessingCtx fromProto(MsgProtos.TbMsgProcessingCtxProto ctx) {