diff --git a/src/ZoneCodeGenerator/Parsing/Testing/AbstractTokenTest.cs b/src/ZoneCodeGenerator/Parsing/Testing/AbstractTokenTest.cs
index 3d6b22a6..ae3da312 100644
--- a/src/ZoneCodeGenerator/Parsing/Testing/AbstractTokenTest.cs
+++ b/src/ZoneCodeGenerator/Parsing/Testing/AbstractTokenTest.cs
@@ -61,12 +61,12 @@ namespace ZoneCodeGenerator.Parsing.Testing
 
         protected string PeekTag()
         {
-            return lastResult?.MatchedTags.ElementAtOrDefault(tagOffset);
+            return lastResult?.MatchedTags.ElementAtOrDefault(tagOffset) ?? "";
         }
 
         protected string NextTag()
         {
-            return lastResult?.MatchedTags.ElementAtOrDefault(tagOffset++);
+            return lastResult?.MatchedTags.ElementAtOrDefault(tagOffset++) ?? "";
         }
 
         protected bool HasMatcherTokens(string matcherName)