--- a/hgext/highlight.py	Tue Apr 08 18:39:02 2008 +0200
+++ b/hgext/highlight.py	Thu Apr 10 14:24:27 2008 +0200
@@ -59,10 +59,10 @@
     try:
         lexer = guess_lexer_for_filename(fctx.path(), text,
                                          encoding=util._encoding)
-    except ClassNotFound:
+    except (ClassNotFound, ValueError):
         try:
             lexer = guess_lexer(text, encoding=util._encoding)
-        except ClassNotFound:
+        except (ClassNotFound, ValueError):
             lexer = TextLexer(encoding=util._encoding)
 
     formatter = HtmlFormatter(style=style, encoding=util._encoding)