From b979aed0fe9a47ce1d7825e2fd40e9ebb0d2be99 Mon Sep 17 00:00:00 2001
From: Brad Clement <bclement@jpl.nasa.gov>
Date: Wed, 2 Oct 2024 16:44:18 -0700
Subject: [PATCH] NPE fix

---
 .../nasa/jpl/aerie/merlin/driver/engine/SimulationEngine.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merlin-driver/src/main/java/gov/nasa/jpl/aerie/merlin/driver/engine/SimulationEngine.java b/merlin-driver/src/main/java/gov/nasa/jpl/aerie/merlin/driver/engine/SimulationEngine.java
index 916df89c95..33fb8f5bef 100644
--- a/merlin-driver/src/main/java/gov/nasa/jpl/aerie/merlin/driver/engine/SimulationEngine.java
+++ b/merlin-driver/src/main/java/gov/nasa/jpl/aerie/merlin/driver/engine/SimulationEngine.java
@@ -843,7 +843,7 @@ public SimulationActivityExtract computeActivitySimulationResults(
                 .stream()
                 .map(spanToActivityInstanceId::get)
                 .toList(),
-            (activityParents.containsKey(span)) ? Optional.empty() : Optional.of(directiveId)
+            (activityParents.containsKey(span)) ? Optional.empty() : Optional.ofNullable(directiveId)
         ));
       }
     });