From 70a98af7a4456442067ae2e81fc145963252fb87 Mon Sep 17 00:00:00 2001
From: Soy Authors <soy-dev@google.com>
Date: Tue, 2 Jun 2026 14:17:57 -0700
Subject: [PATCH] Internal

PiperOrigin-RevId: 925574712
---
 .../src/com/google/template/soy/data/BaseSoyTemplateImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/src/com/google/template/soy/data/BaseSoyTemplateImpl.java b/java/src/com/google/template/soy/data/BaseSoyTemplateImpl.java
index 5d406c6227..e10069abdb 100644
--- a/java/src/com/google/template/soy/data/BaseSoyTemplateImpl.java
+++ b/java/src/com/google/template/soy/data/BaseSoyTemplateImpl.java
@@ -491,8 +491,8 @@ protected static SoyValueProvider asSoyValue(@Nullable Object object) {
     }
 
     @SuppressWarnings("Immutable")
-    protected static SoyValueProvider asTemplateValue(TemplateInterface template) {
-      return TemplateValue.createFromTemplate(template);
+    protected static SoyValueProvider asTemplateValue(@Nullable TemplateInterface template) {
+      return template == null ? NullData.INSTANCE : TemplateValue.createFromTemplate(template);
     }
 
     /** Throws if not required parameters are set. */