diff --git a/basis/html/templates/chloe/chloe-tests.factor b/basis/html/templates/chloe/chloe-tests.factor
index 5114b4088a..542dfa0e05 100644
--- a/basis/html/templates/chloe/chloe-tests.factor
+++ b/basis/html/templates/chloe/chloe-tests.factor
@@ -1,7 +1,8 @@
USING: html.templates html.templates.chloe
tools.test io.streams.string kernel sequences ascii boxes
namespaces xml html.components html.forms
-splitting unicode.categories furnace accessors ;
+splitting unicode.categories furnace accessors
+html.templates.chloe.compiler ;
IN: html.templates.chloe.tests
: run-template
@@ -163,3 +164,9 @@ TUPLE: person first-name last-name ;
"test12" test-template call-template
] run-template
] unit-test
+
+[
+ [
+ "test13" test-template call-template
+ ] run-template
+] [ error>> T{ unknown-chloe-tag f "this-tag-does-not-exist" } = ] must-fail-with
diff --git a/basis/html/templates/chloe/compiler/compiler.factor b/basis/html/templates/chloe/compiler/compiler.factor
index d4f34ab8aa..331b565b98 100644
--- a/basis/html/templates/chloe/compiler/compiler.factor
+++ b/basis/html/templates/chloe/compiler/compiler.factor
@@ -76,10 +76,13 @@ DEFER: compile-element
[ drop tag-stack get pop* ]
} cleave ;
+ERROR: unknown-chloe-tag tag ;
+
: compile-chloe-tag ( tag -- )
- ! "Unknown chloe tag: " prepend throw
dup main>> dup tags get at
- [ curry assert-depth ] [ 2drop ] ?if ;
+ [ curry assert-depth ]
+ [ unknown-chloe-tag ]
+ ?if ;
: compile-element ( element -- )
{
diff --git a/basis/html/templates/chloe/test/test13.xml b/basis/html/templates/chloe/test/test13.xml
new file mode 100644
index 0000000000..adf5daf93c
--- /dev/null
+++ b/basis/html/templates/chloe/test/test13.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/extra/webapps/calculator/calculator.factor b/extra/webapps/calculator/calculator.factor
index d19946d39b..a8c8383e62 100644
--- a/extra/webapps/calculator/calculator.factor
+++ b/extra/webapps/calculator/calculator.factor
@@ -1,6 +1,6 @@
-! Copyright (C) 2008 Slava Pestov.
+! Copyright (C) 2008, 2009 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
-USING: furnace.actions furnace.redirection
+USING: furnace furnace.actions furnace.redirection
http.server.dispatchers html.forms validators urls accessors
math ;
IN: webapps.calculator
diff --git a/extra/webapps/calculator/calculator.xml b/extra/webapps/calculator/calculator.xml
index ed8e60d89a..4dcf5d563a 100644
--- a/extra/webapps/calculator/calculator.xml
+++ b/extra/webapps/calculator/calculator.xml
@@ -2,6 +2,7 @@
+
Calculator
@@ -24,5 +25,6 @@
+
diff --git a/extra/webapps/counter/counter.xml b/extra/webapps/counter/counter.xml
index 75e7cf3c4b..88154438f1 100644
--- a/extra/webapps/counter/counter.xml
+++ b/extra/webapps/counter/counter.xml
@@ -2,12 +2,13 @@
-
+
++
--
+