diff --git a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpConfigUtil.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpConfigUtil.java
index 27872dbf03b..5948edb3b3e 100644
--- a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpConfigUtil.java
+++ b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpConfigUtil.java
@@ -165,7 +165,7 @@ static void configureOtlpHeaders(
         // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#specifying-headers-via-environment-variables
         addHeader.accept(key, URLDecoder.decode(value, StandardCharsets.UTF_8.name()));
       } catch (Exception e) {
-        throw new ConfigurationException("Cannot decode header value: " + value, e);
+        throw new ConfigurationException("Cannot decode header value for header: " + key, e);
       }
     }
   }
diff --git a/exporters/otlp/all/src/test/java/io/opentelemetry/exporter/otlp/internal/OtlpSpanExporterProviderTest.java b/exporters/otlp/all/src/test/java/io/opentelemetry/exporter/otlp/internal/OtlpSpanExporterProviderTest.java
index 1454d209da4..827fdc009ba 100644
--- a/exporters/otlp/all/src/test/java/io/opentelemetry/exporter/otlp/internal/OtlpSpanExporterProviderTest.java
+++ b/exporters/otlp/all/src/test/java/io/opentelemetry/exporter/otlp/internal/OtlpSpanExporterProviderTest.java
@@ -303,9 +303,10 @@ void createExporter_decodingError() {
             () -> {
               provider.createExporter(
                   DefaultConfigProperties.createFromMap(
-                      Collections.singletonMap("otel.exporter.otlp.headers", "header-key=%-1")));
+                      Collections.singletonMap(
+                          "otel.exporter.otlp.headers", "header-key=Bearer%20s3cr3t%-1")));
             })
         .isInstanceOf(ConfigurationException.class)
-        .hasMessage("Cannot decode header value: %-1");
+        .hasMessage("Cannot decode header value for header: header-key");
   }
 }
diff --git a/sdk-extensions/autoconfigure-spi/src/main/java/io/opentelemetry/sdk/autoconfigure/spi/internal/DefaultConfigProperties.java b/sdk-extensions/autoconfigure-spi/src/main/java/io/opentelemetry/sdk/autoconfigure/spi/internal/DefaultConfigProperties.java
index f8818c015bd..25f4821670e 100644
--- a/sdk-extensions/autoconfigure-spi/src/main/java/io/opentelemetry/sdk/autoconfigure/spi/internal/DefaultConfigProperties.java
+++ b/sdk-extensions/autoconfigure-spi/src/main/java/io/opentelemetry/sdk/autoconfigure/spi/internal/DefaultConfigProperties.java
@@ -225,8 +225,7 @@ public Map<String, String> getMap(String name) {
             entry -> {
               String[] split = entry.split("=", 2);
               if (split.length != 2 || StringUtils.isNullOrEmpty(split[0])) {
-                throw new ConfigurationException(
-                    "Invalid map property: " + name + "=" + config.get(name));
+                throw new ConfigurationException("Invalid map property: " + name);
               }
               return filterBlanksAndNulls(split);
             })
diff --git a/sdk-extensions/autoconfigure-spi/src/test/java/io/opentelemetry/sdk/autoconfigure/spi/internal/ConfigPropertiesTest.java b/sdk-extensions/autoconfigure-spi/src/test/java/io/opentelemetry/sdk/autoconfigure/spi/internal/ConfigPropertiesTest.java
index 4a119e600cc..4981c8c4f07 100644
--- a/sdk-extensions/autoconfigure-spi/src/test/java/io/opentelemetry/sdk/autoconfigure/spi/internal/ConfigPropertiesTest.java
+++ b/sdk-extensions/autoconfigure-spi/src/test/java/io/opentelemetry/sdk/autoconfigure/spi/internal/ConfigPropertiesTest.java
@@ -161,16 +161,17 @@ void uncleanMap() {
   void invalidMap() {
     assertThatThrownBy(
             () ->
-                DefaultConfigProperties.createFromMap(Collections.singletonMap("map", "a=1,b"))
+                DefaultConfigProperties.createFromMap(
+                        Collections.singletonMap("map", "authorization=Bearer s3cr3t,malformed"))
                     .getMap("map"))
         .isInstanceOf(ConfigurationException.class)
-        .hasMessage("Invalid map property: map=a=1,b");
+        .hasMessage("Invalid map property: map");
     assertThatThrownBy(
             () ->
                 DefaultConfigProperties.createFromMap(Collections.singletonMap("map", "a=1,=b"))
                     .getMap("map"))
         .isInstanceOf(ConfigurationException.class)
-        .hasMessage("Invalid map property: map=a=1,=b");
+        .hasMessage("Invalid map property: map");
   }
 
   @Test