From e1ce66c4046efcca59483b40b4f0a454c43fb6bd Mon Sep 17 00:00:00 2001
From: Shishir Sharma <ssharma@yugabyte.com>
Date: Thu, 5 Mar 2026 04:49:30 +0000
Subject: [PATCH] Add fix for NPE

---
 .../transforms/yugabytedb/YBExtractNewRecordState.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/debezium-connector-postgres/src/main/java/io/debezium/connector/postgresql/transforms/yugabytedb/YBExtractNewRecordState.java b/debezium-connector-postgres/src/main/java/io/debezium/connector/postgresql/transforms/yugabytedb/YBExtractNewRecordState.java
index 29d21387990..355ec82afb8 100644
--- a/debezium-connector-postgres/src/main/java/io/debezium/connector/postgresql/transforms/yugabytedb/YBExtractNewRecordState.java
+++ b/debezium-connector-postgres/src/main/java/io/debezium/connector/postgresql/transforms/yugabytedb/YBExtractNewRecordState.java
@@ -33,9 +33,13 @@ public R apply(final R record) {
       return ret;
     }
 
-    Pair<Schema, Struct> p = getUpdatedValueAndSchema((Struct) ret.key());
-    Schema updatedSchemaForKey = p.getFirst();
-    Struct updatedValueForKey = p.getSecond();
+    Schema updatedSchemaForKey = ret.keySchema();
+    Object updatedValueForKey = ret.key();
+    if (ret.key() instanceof Struct) {
+      Pair<Schema, Struct> p = getUpdatedValueAndSchema((Struct) ret.key());
+      updatedSchemaForKey = p.getFirst();
+      updatedValueForKey = p.getSecond();
+    }
 
     Schema updatedSchemaForValue = null;
     Struct updatedValueForValue = null;