From 6d113f399fe141a2f7c3850eca4a5676aea1dfbd Mon Sep 17 00:00:00 2001
From: Andrea Marziali <andrea.marziali@datadoghq.com>
Date: Mon, 2 Feb 2026 09:55:55 +0100
Subject: [PATCH] Avoid NPE on DSM context extraction

---
 .../datadog/trace/core/datastreams/DefaultPathwayContext.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultPathwayContext.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultPathwayContext.java
index 316c0bd83e6..167d6b12bb2 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultPathwayContext.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultPathwayContext.java
@@ -200,10 +200,10 @@ private static class PathwayContextExtractor implements BiConsumer<String, Strin
 
     @Override
     public void accept(String key, String value) {
-      if (PROPAGATION_KEY_BASE64.equalsIgnoreCase(key)) {
+      if (value != null && PROPAGATION_KEY_BASE64.equalsIgnoreCase(key)) {
         try {
           extractedContext = decode(timeSource, serviceNameOverride, value);
-        } catch (IOException ignored) {
+        } catch (Throwable ignored) {
         }
       }
     }