--- JSPWikiMarkupParser.java.orig	2007-12-11 14:37:03.000000000 +0100
+++ JSPWikiMarkupParser.java	2007-12-11 15:30:47.000000000 +0100
@@ -2314,7 +2314,18 @@
             //
             //  Check if there is an attempt to do something nasty
             //
-            style = StringEscapeUtils.unescapeHtml(style);
+            try 
+            {
+                style = StringEscapeUtils.unescapeHtml(style);
+            } 
+            catch (Exception e) 
+            {
+                log.info("Parser failure: ",e);
+                ResourceBundle rb = m_context.getBundle(InternationalizationManager.CORE_BUNDLE);
+                Object[] args = { e.getMessage() };
+                return addElement( makeError( MessageFormat.format( rb.getString( "markupparser.error.parserfailure" ), args ) ) );                
+            }
+            
             if( style != null && style.indexOf("javascript:") != -1 )
             {
                 log.debug("Attempt to output javascript within CSS:"+style);