From 36c5f1070fcfc0145c3bf87d1166799669a28343 Mon Sep 17 00:00:00 2001
From: jtkech <jean-thierry.kechichian@wanadoo.fr>
Date: Thu, 17 Dec 2015 00:23:12 +0100
Subject: [PATCH] Update Tokenizer.cs

---
 .../Modules/Orchard.Tokens/Implementation/Tokenizer.cs      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Implementation/Tokenizer.cs b/src/Orchard.Web/Modules/Orchard.Tokens/Implementation/Tokenizer.cs
index 5a12b460d..683166ba5 100644
--- a/src/Orchard.Web/Modules/Orchard.Tokens/Implementation/Tokenizer.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tokens/Implementation/Tokenizer.cs
@@ -53,7 +53,9 @@ namespace Orchard.Tokens.Implementation {
             var replacements = Evaluate(options.Predicate == null ? tokens : tokens.Where(options.Predicate), data);
 
             return replacements.Aggregate(tokenset.Item1,
-                (current, replacement) => current.Replace((hashMode ? "#{" : "{") + replacement.Key + "}", (options.Encoding ?? ReplaceOptions.NoEncode)(replacement.Key, replacement.Value)));
+                (current, replacement) => replacement.Value == null ? 
+                current : current.Replace((hashMode ? "#{" : "{") + replacement.Key + "}",
+                (options.Encoding ?? ReplaceOptions.NoEncode)(replacement.Key, replacement.Value)));
         }
 
         private static Tuple<string, IEnumerable<string>> Parse(string text, bool hashMode) {
@@ -111,4 +113,4 @@ namespace Orchard.Tokens.Implementation {
         }
 
     }
-}
\ No newline at end of file
+}