From cc74a8c533156117c9f1e0cb3fa6957e746b5388 Mon Sep 17 00:00:00 2001
From: Adam Retter <adam.retter@googlemail.com>
Date: Wed, 5 Nov 2025 23:04:30 +0100
Subject: [PATCH] [bugfix] Avoid an NPE when there are no XUpdate Conditionals

---
 .../src/main/java/org/exist/xupdate/XUpdateProcessor.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exist-core/src/main/java/org/exist/xupdate/XUpdateProcessor.java b/exist-core/src/main/java/org/exist/xupdate/XUpdateProcessor.java
index 5fe13a7bd6..339ea8a6ce 100644
--- a/exist-core/src/main/java/org/exist/xupdate/XUpdateProcessor.java
+++ b/exist-core/src/main/java/org/exist/xupdate/XUpdateProcessor.java
@@ -950,7 +950,7 @@ private Conditional popConditional() {
 
     private @Nullable Conditional peekConditional() {
         if (conditionals == null) {
-            throw null;
+            return null;
         }
         return conditionals.peek();
     }