diff --git a/collects/web-server/default-web-root/htdocs/error.css b/collects/web-server/default-web-root/htdocs/error.css
index 4267dadad5..a31d609f56 100644
--- a/collects/web-server/default-web-root/htdocs/error.css
+++ b/collects/web-server/default-web-root/htdocs/error.css
@@ -17,6 +17,12 @@
 }
 
 .section > pre {
+ white-space: pre-wrap;       /* css-3 */
+ white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
+ white-space: -pre-wrap;      /* Opera 4-6 */
+ white-space: -o-pre-wrap;    /* Opera 7 */
+ word-wrap: break-word;       /* Internet Explorer 5.5+ */
+ 
   background-color: #ffccff;
   margin-left: 5px;
   margin-right: 5px;
diff --git a/collects/xml/private/xexpr.rkt b/collects/xml/private/xexpr.rkt
index d8688f8afb..035e69d9b5 100644
--- a/collects/xml/private/xexpr.rkt
+++ b/collects/xml/private/xexpr.rkt
@@ -121,7 +121,7 @@
                  (true))
             (false
              (make-exn:invalid-xexpr
-              (format "Expected a pair, given ~s" attr)
+              (format "Expected an attribute pair, given ~s" attr)
               (current-continuation-marks)
               attr))))))
 
@@ -134,15 +134,15 @@
                   (permissive-xexprs))
               (true)
               (false (make-exn:invalid-xexpr
-                      (format "Expected a string, given ~s" (cadr attr))
+                      (format "Expected an attribute value string, given ~v" (cadr attr))
                       (current-continuation-marks)
                       (cadr attr))))
           (false (make-exn:invalid-xexpr
-                  (format "Expected an attribute value string for attribute ~s" attr)
+                  (format "Expected an attribute value string for attribute ~s, given nothing" attr)
                   (current-continuation-marks)
                   attr)))
       (false (make-exn:invalid-xexpr
-              (format "Expected a symbol, given ~s" (car attr))
+              (format "Expected an attribute symbol, given ~s" (car attr))
               (current-continuation-marks)
               (cadr attr)))))