diff --git a/basis/html/components/components-tests.factor b/basis/html/components/components-tests.factor
index b3ea0319a8..410c3ce223 100644
--- a/basis/html/components/components-tests.factor
+++ b/basis/html/components/components-tests.factor
@@ -32,6 +32,11 @@ TUPLE: color red green blue ;
     ] with-string-writer
 ] unit-test
 
+[ "<input value=\"&lt;jimmy>\" name=\"red\" type=\"hidden\"/>" ] [
+    [
+        "red" hidden render
+    ] with-string-writer
+] unit-test
 [ "<input value=\"&lt;jimmy>\" name=\"red\" type=\"hidden\"/>" ] [
     [
         "red" hidden render
@@ -184,3 +189,9 @@ M: link-test link-href drop "http://www.apple.com/foo&bar" ;
         }
     }
 ] [ values ] unit-test
+
+[ ] [ "error" "blah" <validation-error> "error" set-value ] unit-test
+
+[ ] [
+    "error" hidden render
+] unit-test
diff --git a/basis/html/components/components.factor b/basis/html/components/components.factor
index 40621bc29f..f811343df2 100644
--- a/basis/html/components/components.factor
+++ b/basis/html/components/components.factor
@@ -15,12 +15,12 @@ GENERIC: render* ( value name renderer -- xml )
     prepare-value
     [
         dup validation-error?
-        [ [ message>> ] [ value>> ] bi ]
+        [ [ message>> render-error ] [ value>> ] bi ]
         [ f swap ]
         if
     ] 2dip
-    render* write-xml
-    [ render-error ] when* ;
+    render*
+    swap 2array write-xml ;
 
 SINGLETON: label