From 6ca0c8968440830ad37d19a84b6d9222a4c3c60a Mon Sep 17 00:00:00 2001
From: Jianfeng Mao <4297243+jmao-denver@users.noreply.github.com>
Date: Thu, 18 Jul 2024 15:41:40 -0600
Subject: [PATCH] fix: Check for null result in error handling (#5808)

Fixes #5806
---
 .../java/io/deephaven/engine/table/impl/MergedListener.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/MergedListener.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/MergedListener.java
index 3c7e63883aa..3a5b39e898e 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/MergedListener.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/MergedListener.java
@@ -162,7 +162,7 @@ protected void propagateError(
     }
 
     protected boolean systemicResult() {
-        return SystemicObjectTracker.isSystemic(result);
+        return result == null ? false : SystemicObjectTracker.isSystemic(result);
     }
 
     @Override
@@ -172,6 +172,9 @@ protected void destroy() {
 
     protected void propagateErrorDownstream(
             final boolean fromProcess, @NotNull final Throwable error, @Nullable final TableListener.Entry entry) {
+        if (result == null) {
+            return;
+        }
         if (fromProcess && result.satisfied(getUpdateGraph().clock().currentStep())) {
             // If the result is already satisfied (because it managed to send its notification, or was otherwise
             // satisfied) we should not send our error notification on this cycle.