From 1e3c176ddf97044cf50e25e9975f54b860860f39 Mon Sep 17 00:00:00 2001
From: Leigh Pointer <leigh-pointer@users.noreply.github.com>
Date: Sat, 22 Nov 2025 13:31:04 +0100
Subject: [PATCH] Update ReplaceTokens on ModuleBase

Check for Contents == null
---
 Oqtane.Client/Modules/ModuleBase.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs
index 00dc2c61..264930c4 100644
--- a/Oqtane.Client/Modules/ModuleBase.cs
+++ b/Oqtane.Client/Modules/ModuleBase.cs
@@ -460,6 +460,11 @@ namespace Oqtane.Modules
 
         public string ReplaceTokens(string content, object obj)
         {
+            // check for null or empty content
+            if (string.IsNullOrEmpty(content))
+            {
+                return content;
+            }
             // Using StringBuilder avoids the performance penalty of repeated string allocations
             // that occur with string.Replace or string concatenation inside loops.
             var sb = new StringBuilder();