diff --git a/Fluid.Tests/Extensibility/ExtensibilityTests.cs b/Fluid.Tests/Extensibility/ExtensibilityTests.cs
index 52a8a33b..6f53eebb 100644
--- a/Fluid.Tests/Extensibility/ExtensibilityTests.cs
+++ b/Fluid.Tests/Extensibility/ExtensibilityTests.cs
@@ -1,5 +1,6 @@
 using Fluid.Ast;
 using Parlot.Fluent;
+using System;
 using Xunit;
 
 namespace Fluid.Tests.Extensibility
@@ -24,6 +25,21 @@ public void ShouldRenderEmptyTags()
             Assert.Equal("Hello World", result);
         }
 
+        [Fact]
+        public void ShouldReportAndErrorOnEmptyTags()
+        {
+            var parser = new CustomParser();
+
+            parser.RegisterEmptyTag("hello", (w, e, c) =>
+            {
+                w.Write("Hello World");
+
+                return Statement.Normal();
+            });
+
+            Assert.Throws<ParseException>(() => parser.Parse("{% hello foo %}"));
+        }
+
         [Fact]
         public void ShouldRenderIdentifierTags()
         {
diff --git a/Fluid/FluidParser.cs b/Fluid/FluidParser.cs
index 527544c8..4f3e0ac5 100644
--- a/Fluid/FluidParser.cs
+++ b/Fluid/FluidParser.cs
@@ -502,7 +502,7 @@ public void RegisterParserBlock<T>(string tagName, Parser<T> parser, Func<T, IRe
         {
             RegisteredTags[tagName] = parser.AndSkip(TagEnd).And(AnyTagsList).AndSkip(CreateTag("end" + tagName).ElseError($"'{{% end{tagName} %}}' was expected"))
                 .Then<Statement>(x => new ParserBlockStatement<T>(x.Item1, x.Item2, render))
-                .ElseError($"Invalid 'tagName' tag")
+                .ElseError($"Invalid {tagName} tag")
                 ;
         }
 
@@ -513,7 +513,7 @@ public void RegisterParserTag<T>(string tagName, Parser<T> parser, Func<T, TextW
 
         public void RegisterEmptyTag(string tagName, Func<TextWriter, TextEncoder, TemplateContext, ValueTask<Completion>> render)
         {
-            RegisteredTags[tagName] = TagEnd.Then<Statement>(x => new EmptyTagStatement(render));
+            RegisteredTags[tagName] = TagEnd.Then<Statement>(x => new EmptyTagStatement(render)).ElseError($"Unexpected arguments in {tagName} tag");
         }
 
         public void RegisterEmptyBlock(string tagName, Func<IReadOnlyList<Statement>, TextWriter, TextEncoder, TemplateContext, ValueTask<Completion>> render)