diff --git a/src/djlint/__init__.py b/src/djlint/__init__.py
index 0e6a5f0..e25d2b0 100644
--- a/src/djlint/__init__.py
+++ b/src/djlint/__init__.py
@@ -298,10 +298,12 @@ def main(
         for error in file_errors:
             error_count += build_output(error)
 
-        success_message = "%sed %s, found %d errors." % (
+        error_case = "error" if error_count == 1 else "errors"
+        success_message = "%sed %s, found %d %s." % (
             message,
             file_quantity,
             error_count,
+            error_case,
         )
 
     success_color = Fore.RED + Style.BRIGHT if error_count > 0 else Fore.BLUE
diff --git a/src/djlint/rules.yaml b/src/djlint/rules.yaml
index 8cd3f05..59deb50 100644
--- a/src/djlint/rules.yaml
+++ b/src/djlint/rules.yaml
@@ -11,7 +11,7 @@
     - '[^{]{\/[^\s]+|^{\/[^\s]+'
     - '[^{]{\@[^\s]+|^{\@[^\s]+'
     # close
-    - '[^\s]+[}|%|#]}'
+    - '[^(\s|^)]+[}|%|#]}'
     - \s{2,}[}|%|#]}
     - '{[{|%|#]\s{2,}'
 - rule:
diff --git a/tests/test_djlint.py b/tests/test_djlint.py
index a1e9775..b9ff422 100644
--- a/tests/test_djlint.py
+++ b/tests/test_djlint.py
@@ -119,6 +119,7 @@ def test_W006(runner, tmp_file):
     result = runner.invoke(djlint, [tmp_file.name])
     assert result.exit_code == 0
     assert "W006 1:" in result.output
+    assert "a" == "b"
 
 
 def test_W007(runner, tmp_file):
@@ -211,6 +212,13 @@ def test_W018(runner, tmp_file):
     assert "W018 1:" in result.output
 
 
+def test_handlebars_else(runner, tmp_file):
+    write_to_file(tmp_file.name, b"{{^}}")
+    result = runner.invoke(djlint, [tmp_file.name])
+    assert result.exit_code == 0
+    assert "Linted 1 file, found 0 errors." in result.output
+
+
 # assert "asdf" in result.output