diff --git a/src/nu/validator/htmlparser/impl/ErrorReportingTokenizer.java b/src/nu/validator/htmlparser/impl/ErrorReportingTokenizer.java
index 9db9e8a7..7494fb28 100644
--- a/src/nu/validator/htmlparser/impl/ErrorReportingTokenizer.java
+++ b/src/nu/validator/htmlparser/impl/ErrorReportingTokenizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2013 Mozilla Foundation
+ * Copyright (c) 2009-2017 Mozilla Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -413,8 +413,8 @@ private boolean isAstralPrivateUse(int c) {
         err("Nameless doctype.");
     }
 
-    @Override protected void errConsecutiveHyphens() throws SAXException {
-        err("Consecutive hyphens did not terminate a comment. \u201C--\u201D is not permitted inside a comment, but e.g. \u201C- -\u201D is.");
+    @Override protected void errNestedComment() throws SAXException {
+        err("Saw \u201C<!--\u201D within a comment. Probable cause: Nested comment (not allowed).");
     }
 
     @Override protected void errPrematureEndOfComment() throws SAXException {
@@ -712,10 +712,6 @@ private boolean isAstralPrivateUse(int c) {
         err("Missing space before doctype name.");
     }
 
-    @Override protected void errHyphenHyphenBang() throws SAXException {
-        err("\u201C--!\u201D found in comment.");
-    }
-
     @Override protected void errNcrControlChar() throws SAXException {
         err("Character reference expands to a control character ("
                 + toUPlusString((char) value) + ").");
diff --git a/src/nu/validator/htmlparser/impl/LocatorImpl.java b/src/nu/validator/htmlparser/impl/LocatorImpl.java
index 7a559d90..b334aa6a 100644
--- a/src/nu/validator/htmlparser/impl/LocatorImpl.java
+++ b/src/nu/validator/htmlparser/impl/LocatorImpl.java
@@ -24,22 +24,38 @@
 package nu.validator.htmlparser.impl;
 
 import org.xml.sax.Locator;
+import org.xml.sax.ext.Locator2;
 
-public class LocatorImpl implements Locator {
+public class LocatorImpl implements Locator, Locator2 {
 
     private final String systemId;
 
     private final String publicId;
 
+    private final String encoding;
+
     private final int column;
 
     private final int line;
 
+    /**
+     * Create a new Locator with default values
+     */
+    public LocatorImpl() {
+        this.systemId = this.publicId = this.encoding = null;
+        this.column = this.line = 0;
+    }
+
     public LocatorImpl(Locator locator) {
         this.systemId = locator.getSystemId();
         this.publicId = locator.getPublicId();
         this.column = locator.getColumnNumber();
         this.line = locator.getLineNumber();
+        if (locator instanceof Locator2) {
+            this.encoding = ((Locator2)locator).getEncoding();
+        } else {
+            this.encoding = null;
+        }
     }
 
     public final int getColumnNumber() {
@@ -57,4 +73,12 @@ public final String getPublicId() {
     public final String getSystemId() {
         return systemId;
     }
+
+    public final String getXMLVersion() {
+        return "1.0";
+    }
+
+    public final String getEncoding() {
+        return encoding;
+    }
 }
diff --git a/src/nu/validator/htmlparser/impl/Tokenizer.java b/src/nu/validator/htmlparser/impl/Tokenizer.java
index 318df252..45073f85 100755
--- a/src/nu/validator/htmlparser/impl/Tokenizer.java
+++ b/src/nu/validator/htmlparser/impl/Tokenizer.java
@@ -37,6 +37,7 @@
 
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.Locator;
+import org.xml.sax.ext.Locator2;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
@@ -66,7 +67,7 @@
  * @version $Id$
  * @author hsivonen
  */
-public class Tokenizer implements Locator {
+public class Tokenizer implements Locator, Locator2 {
 
     private static final int DATA_AND_RCDATA_MASK = ~1;
 
@@ -220,6 +221,16 @@ public class Tokenizer implements Locator {
 
     public static final int PROCESSING_INSTRUCTION_QUESTION_MARK = 74;
 
+    public static final int AMBIGUOUS_AMPERSAND = 75;
+
+    public static final int COMMENT_LESSTHAN = 76;
+
+    public static final int COMMENT_LESSTHAN_BANG = 77;
+
+    public static final int COMMENT_LESSTHAN_BANG_DASH = 78;
+
+    public static final int COMMENT_LESSTHAN_BANG_DASH_DASH = 79;
+
     /**
      * Magic value for UTF-16 operations.
      */
@@ -882,6 +893,24 @@ public String getSystemId() {
         return systemId;
     }
 
+    /**
+     * @see org.xml.sax.ext.Locator2#getXMLVersion()
+     */
+    public String getXMLVersion() {
+        return "1.0";
+    }
+
+    /**
+     * @see org.xml.sax.ext.Locator2#getXMLVersion()
+     */
+    public String getEncoding() {
+        try {
+            return encodingDeclarationHandler == null ? null : encodingDeclarationHandler.getCharacterEncoding();
+        } catch (SAXException e) {
+            return null;
+        }
+    }
+
     // end Locator impl
 
     // end public API
@@ -1032,9 +1061,8 @@ private void maybeAppendSpaceToBogusComment() throws SAXException {
 
     // ]NOCPP]
 
-    @Inline private void adjustDoubleHyphenAndAppendToStrBufAndErr(char c)
+    @Inline private void adjustDoubleHyphenAndAppendToStrBufAndErr(char c, boolean reportedConsecutiveHyphens)
             throws SAXException {
-        errConsecutiveHyphens();
         // [NOCPP[
         switch (commentPolicy) {
             case ALTER_INFOSET:
@@ -1045,7 +1073,9 @@ private void maybeAppendSpaceToBogusComment() throws SAXException {
                 appendStrBuf('-');
                 // CPPONLY: MOZ_FALLTHROUGH;
             case ALLOW:
-                warn("The document is not mappable to XML 1.0 due to two consecutive hyphens in a comment.");
+                if (!reportedConsecutiveHyphens) {
+                    warn("The document is not mappable to XML 1.0 due to two consecutive hyphens in a comment.");
+                }
                 // ]NOCPP]
                 appendStrBuf(c);
                 // [NOCPP[
@@ -1287,7 +1317,7 @@ private void addAttributeWithoutValue() throws SAXException {
         // [NOCPP[
         if (metaBoundaryPassed && AttributeName.CHARSET == attributeName
                 && ElementName.META == tagName) {
-            err("A \u201Ccharset\u201D attribute on a \u201Cmeta\u201D element found after the first 512 bytes.");
+            err("A \u201Ccharset\u201D attribute on a \u201Cmeta\u201D element found after the first 1024 bytes.");
         }
         // ]NOCPP]
         if (attributeName != null) {
@@ -1335,7 +1365,7 @@ private void addAttributeWithValue() throws SAXException {
         // [NOCPP[
         if (metaBoundaryPassed && ElementName.META == tagName
                 && AttributeName.CHARSET == attributeName) {
-            err("A \u201Ccharset\u201D attribute on a \u201Cmeta\u201D element found after the first 512 bytes.");
+            err("A \u201Ccharset\u201D attribute on a \u201Cmeta\u201D element found after the first 1024 bytes.");
         }
         // ]NOCPP]
         if (attributeName != null) {
@@ -1507,6 +1537,7 @@ private void ensureBufferSpace(int inputLength) throws SAXException {
     @SuppressWarnings("unused") private int stateLoop(int state, char c,
             int pos, @NoLength char[] buf, boolean reconsume, int returnState,
             int endPos) throws SAXException {
+        boolean reportedConsecutiveHyphens = false;
         /*
          * Idioms used in this code:
          *
@@ -2592,6 +2623,7 @@ private void ensureBufferSpace(int inputLength) throws SAXException {
                     }
                     // CPPONLY: MOZ_FALLTHROUGH;
                 case COMMENT_START:
+                    reportedConsecutiveHyphens = false;
                     commentstartloop: for (;;) {
                         if (++pos == endPos) {
                             break stateloop;
@@ -2624,6 +2656,10 @@ private void ensureBufferSpace(int inputLength) throws SAXException {
                                  */
                                 state = transition(state, Tokenizer.DATA, reconsume, pos);
                                 continue stateloop;
+                            case '<':
+                                appendStrBuf(c);
+                                state = transition(state, Tokenizer.COMMENT_LESSTHAN, reconsume, pos);
+                                continue stateloop;
                             case '\r':
                                 appendStrBufCarriageReturn();
                                 state = transition(state, Tokenizer.COMMENT, reconsume, pos);
@@ -2669,6 +2705,10 @@ private void ensureBufferSpace(int inputLength) throws SAXException {
                                 state = transition(state, Tokenizer.COMMENT_END_DASH, reconsume, pos);
                                 break commentloop;
                             // continue stateloop;
+                            case '<':
+                                appendStrBuf(c);
+                                state = transition(state, Tokenizer.COMMENT_LESSTHAN, reconsume, pos);
+                                continue stateloop;
                             case '\r':
                                 appendStrBufCarriageReturn();
                                 break stateloop;
@@ -2711,6 +2751,10 @@ private void ensureBufferSpace(int inputLength) throws SAXException {
                                 state = transition(state, Tokenizer.COMMENT_END, reconsume, pos);
                                 break commentenddashloop;
                             // continue stateloop;
+                            case '<':
+                                appendStrBuf(c);
+                                state = transition(state, Tokenizer.COMMENT_LESSTHAN, reconsume, pos);
+                                continue stateloop;
                             case '\r':
                                 appendStrBufCarriageReturn();
                                 state = transition(state, Tokenizer.COMMENT, reconsume, pos);
@@ -2765,11 +2809,16 @@ private void ensureBufferSpace(int inputLength) throws SAXException {
                                  * Append a U+002D HYPHEN-MINUS (-) character to
                                  * the comment token's data.
                                  */
-                                adjustDoubleHyphenAndAppendToStrBufAndErr(c);
+                                adjustDoubleHyphenAndAppendToStrBufAndErr(c, reportedConsecutiveHyphens);
+                                reportedConsecutiveHyphens = true;
                                 /*
                                  * Stay in the comment end state.
                                  */
                                 continue;
+                            case '<':
+                                appendStrBuf(c);
+                                state = transition(state, Tokenizer.COMMENT_LESSTHAN, reconsume, pos);
+                                continue stateloop;
                             case '\r':
                                 adjustDoubleHyphenAndAppendToStrBufCarriageReturn();
                                 state = transition(state, Tokenizer.COMMENT, reconsume, pos);
@@ -2779,7 +2828,6 @@ private void ensureBufferSpace(int inputLength) throws SAXException {
                                 state = transition(state, Tokenizer.COMMENT, reconsume, pos);
                                 continue stateloop;
                             case '!':
-                                errHyphenHyphenBang();
                                 appendStrBuf(c);
                                 state = transition(state, Tokenizer.COMMENT_END_BANG, reconsume, pos);
                                 continue stateloop;
@@ -2792,7 +2840,8 @@ private void ensureBufferSpace(int inputLength) throws SAXException {
                                  * and the input character to the comment
                                  * token's data.
                                  */
-                                adjustDoubleHyphenAndAppendToStrBufAndErr(c);
+                                adjustDoubleHyphenAndAppendToStrBufAndErr(c, reportedConsecutiveHyphens);
+                                reportedConsecutiveHyphens = true;
                                 /*
                                  * Switch to the comment state.
                                  */
@@ -2862,6 +2911,151 @@ private void ensureBufferSpace(int inputLength) throws SAXException {
                                 continue stateloop;
                         }
                     }
+                case COMMENT_LESSTHAN:
+                    for (;;) {
+                        if (++pos == endPos) {
+                            break stateloop;
+                        }
+                        c = checkChar(buf, pos);
+                        switch (c) {
+                            case '!':
+                                appendStrBuf(c);
+                                state = transition(state, Tokenizer.COMMENT_LESSTHAN_BANG, reconsume, pos);
+                                continue stateloop;
+                            case '<':
+                                appendStrBuf(c);
+                                continue;
+                            case '-':
+                                appendStrBuf(c);
+                                state = transition(state, Tokenizer.COMMENT_END_DASH, reconsume, pos);
+                                continue stateloop;
+                            case '\r':
+                                appendStrBufCarriageReturn();
+                                break stateloop;
+                            case '\n':
+                                appendStrBufLineFeed();
+                                continue;
+                            case '\u0000':
+                                c = '\uFFFD';
+                                // CPPONLY: MOZ_FALLTHROUGH;
+                            default:
+                                appendStrBuf(c);
+                                state = transition(state, Tokenizer.COMMENT, reconsume, pos);
+                                continue stateloop;
+                        }
+                    }
+                    // CPPONLY: MOZ_FALLTHROUGH;
+                case COMMENT_LESSTHAN_BANG:
+                    for (;;) {
+                        if (++pos == endPos) {
+                            break stateloop;
+                        }
+                        c = checkChar(buf, pos);
+                        switch (c) {
+                            case '-':
+                                appendStrBuf(c);
+                                state = transition(state, Tokenizer.COMMENT_LESSTHAN_BANG_DASH, reconsume, pos);
+                                continue stateloop;
+                            case '<':
+                                appendStrBuf(c);
+                                state = transition(state, Tokenizer.COMMENT_LESSTHAN, reconsume, pos);
+                                continue stateloop;
+                            case '\r':
+                                appendStrBufCarriageReturn();
+                                break stateloop;
+                            case '\n':
+                                appendStrBufLineFeed();
+                                continue;
+                            case '\u0000':
+                                c = '\uFFFD';
+                                // CPPONLY: MOZ_FALLTHROUGH;
+                            default:
+                                appendStrBuf(c);
+                                state = transition(state, Tokenizer.COMMENT, reconsume, pos);
+                                continue stateloop;
+                        }
+                    }
+                    // CPPONLY: MOZ_FALLTHROUGH;
+                case COMMENT_LESSTHAN_BANG_DASH:
+                    for (;;) {
+                        if (++pos == endPos) {
+                            break stateloop;
+                        }
+                        c = checkChar(buf, pos);
+                        switch (c) {
+                            case '-':
+                                appendStrBuf(c);
+                                state = transition(state, Tokenizer.COMMENT_LESSTHAN_BANG_DASH_DASH, reconsume, pos);
+                                continue stateloop;
+                            case '<':
+                                appendStrBuf(c);
+                                state = transition(state, Tokenizer.COMMENT_LESSTHAN, reconsume, pos);
+                                continue stateloop;
+                            case '\r':
+                                appendStrBufCarriageReturn();
+                                break stateloop;
+                            case '\n':
+                                appendStrBufLineFeed();
+                                continue;
+                            case '\u0000':
+                                c = '\uFFFD';
+                                // CPPONLY: MOZ_FALLTHROUGH;
+                            default:
+                                appendStrBuf(c);
+                                state = transition(state, Tokenizer.COMMENT, reconsume, pos);
+                                continue stateloop;
+                        }
+                    }
+                    // CPPONLY: MOZ_FALLTHROUGH;
+                case COMMENT_LESSTHAN_BANG_DASH_DASH:
+                    for (;;) {
+                        if (++pos == endPos) {
+                            break stateloop;
+                        }
+                        c = checkChar(buf, pos);
+                        switch (c) {
+                            case '>':
+                                appendStrBuf(c);
+                                emitComment(3, pos);
+                                state = transition(state, Tokenizer.DATA, reconsume, pos);
+                                continue stateloop;
+                            case '-':
+                                errNestedComment();
+                                adjustDoubleHyphenAndAppendToStrBufAndErr(c, reportedConsecutiveHyphens);
+                                reportedConsecutiveHyphens = true;
+                                state = transition(state, Tokenizer.COMMENT_END, reconsume, pos);
+                                continue stateloop;
+                            case '\r':
+                                errNestedComment();
+                                adjustDoubleHyphenAndAppendToStrBufAndErr(c, reportedConsecutiveHyphens);
+                                reportedConsecutiveHyphens = true;
+                                state = transition(state, Tokenizer.COMMENT, reconsume, pos);
+                                break stateloop;
+                            case '\n':
+                                errNestedComment();
+                                adjustDoubleHyphenAndAppendToStrBufAndErr(c, reportedConsecutiveHyphens);
+                                reportedConsecutiveHyphens = true;
+                                state = transition(state, Tokenizer.COMMENT, reconsume, pos);
+                                continue;
+                            case '\u0000':
+                                c = '\uFFFD';
+                                // CPPONLY: MOZ_FALLTHROUGH;
+                            case '!':
+                                errNestedComment();
+                                adjustDoubleHyphenAndAppendToStrBufAndErr(c, reportedConsecutiveHyphens);
+                                reportedConsecutiveHyphens = true;
+                                state = transition(state, Tokenizer.COMMENT_END_BANG, reconsume, pos);
+                                continue stateloop;
+                            default:
+                                errNestedComment();
+                                adjustDoubleHyphenAndAppendToStrBufAndErr(c, reportedConsecutiveHyphens);
+                                reportedConsecutiveHyphens = true;
+                                state = transition(state, Tokenizer.COMMENT_END, reconsume, pos);
+                                continue stateloop;
+                        }
+                    }
+                    // CPPONLY: MOZ_FALLTHROUGH;
+                    // XXX reorder point
                 case COMMENT_START_DASH:
                     if (++pos == endPos) {
                         break stateloop;
@@ -2890,6 +3084,10 @@ private void ensureBufferSpace(int inputLength) throws SAXException {
                              */
                             state = transition(state, Tokenizer.DATA, reconsume, pos);
                             continue stateloop;
+                        case '<':
+                            appendStrBuf(c);
+                            state = transition(state, Tokenizer.COMMENT_LESSTHAN, reconsume, pos);
+                            continue stateloop;
                         case '\r':
                             appendStrBufCarriageReturn();
                             state = transition(state, Tokenizer.COMMENT, reconsume, pos);
@@ -3106,6 +3304,7 @@ private void ensureBufferSpace(int inputLength) throws SAXException {
                         case '<':
                         case '&':
                         case '\u0000':
+                        case ';':
                             emitOrAppendCharRefBuf(returnState);
                             if ((returnState & DATA_AND_RCDATA_MASK) == 0) {
                                 cstart = pos;
@@ -3134,17 +3333,12 @@ private void ensureBufferSpace(int inputLength) throws SAXException {
                                 firstCharKey = c - 'A';
                             } else {
                                 // No match
-                                /*
-                                 * If no match can be made, then this is a parse
-                                 * error.
-                                 */
-                                errNoNamedCharacterMatch();
                                 emitOrAppendCharRefBuf(returnState);
                                 if ((returnState & DATA_AND_RCDATA_MASK) == 0) {
                                     cstart = pos;
                                 }
                                 reconsume = true;
-                                state = transition(state, returnState, reconsume, pos);
+                                state = transition(state, Tokenizer.AMBIGUOUS_AMPERSAND, reconsume, pos);
                                 continue stateloop;
                             }
                             // Didn't fail yet
@@ -3205,17 +3399,12 @@ private void ensureBufferSpace(int inputLength) throws SAXException {
                             }
                         }
                         if (hilo == 0) {
-                            /*
-                             * If no match can be made, then this is a parse
-                             * error.
-                             */
-                            errNoNamedCharacterMatch();
                             emitOrAppendCharRefBuf(returnState);
                             if ((returnState & DATA_AND_RCDATA_MASK) == 0) {
                                 cstart = pos;
                             }
                             reconsume = true;
-                            state = transition(state, returnState, reconsume, pos);
+                            state = transition(state, Tokenizer.AMBIGUOUS_AMPERSAND, reconsume, pos);
                             continue stateloop;
                         }
                         // Didn't fail yet
@@ -3298,16 +3487,12 @@ private void ensureBufferSpace(int inputLength) throws SAXException {
 
                     if (candidate == -1) {
                         // reconsume deals with CR, LF or nul
-                        /*
-                         * If no match can be made, then this is a parse error.
-                         */
-                        errNoNamedCharacterMatch();
                         emitOrAppendCharRefBuf(returnState);
                         if ((returnState & DATA_AND_RCDATA_MASK) == 0) {
                             cstart = pos;
                         }
                         reconsume = true;
-                        state = transition(state, returnState, reconsume, pos);
+                        state = transition(state, Tokenizer.AMBIGUOUS_AMPERSAND, reconsume, pos);
                         continue stateloop;
                     } else {
                         // c can't be CR, LF or nul if we got here
@@ -3345,10 +3530,9 @@ private void ensureBufferSpace(int inputLength) throws SAXException {
                                      * after the U+0026 AMPERSAND (&) must be
                                      * unconsumed, and nothing is returned.
                                      */
-                                    errNoNamedCharacterMatch();
                                     appendCharRefBufToStrBuf();
                                     reconsume = true;
-                                    state = transition(state, returnState, reconsume, pos);
+                                    state = transition(state, Tokenizer.AMBIGUOUS_AMPERSAND, reconsume, pos);
                                     continue stateloop;
                                 }
                             }
@@ -3411,6 +3595,34 @@ private void ensureBufferSpace(int inputLength) throws SAXException {
                          * I'm ∉ I tell you.
                          */
                     }
+                    // XXX reorder point
+                case AMBIGUOUS_AMPERSAND:
+                    ampersandloop: for (;;) {
+                        if (reconsume) {
+                            if (++pos == endPos) {
+                                break stateloop;
+                            }
+                            pos--;
+                            c = checkChar(buf, pos);
+                        }
+                        if (c == ';') {
+                            errNoNamedCharacterMatch();
+                        } else if ((c >= '0' && c <= '9')
+                                || (c >= 'A' && c <= 'Z')
+                                || (c >= 'a' && c <= 'z')) {
+                            if (returnState == ATTRIBUTE_VALUE_DOUBLE_QUOTED
+                                    || returnState == ATTRIBUTE_VALUE_SINGLE_QUOTED
+                                    || returnState == ATTRIBUTE_VALUE_UNQUOTED) {
+                                appendStrBuf(c);
+                            }
+                            /* The following pos++ is necessary due to how we’ve
+                             * handled the "reconsume" block for this case. */
+                            pos++;
+                            continue;
+                        }
+                        state = transition(state, returnState, reconsume, pos);
+                        continue stateloop;
+                    }
                 case CONSUME_NCR:
                     if (++pos == endPos) {
                         break stateloop;
@@ -6009,13 +6221,13 @@ private void initDoctypeFields() {
     @Inline private void adjustDoubleHyphenAndAppendToStrBufCarriageReturn()
             throws SAXException {
         silentCarriageReturn();
-        adjustDoubleHyphenAndAppendToStrBufAndErr('\n');
+        adjustDoubleHyphenAndAppendToStrBufAndErr('\n', false);
     }
 
     @Inline private void adjustDoubleHyphenAndAppendToStrBufLineFeed()
             throws SAXException {
         silentLineFeed();
-        adjustDoubleHyphenAndAppendToStrBufAndErr('\n');
+        adjustDoubleHyphenAndAppendToStrBufAndErr('\n', false);
     }
 
     @Inline private void appendStrBufLineFeed() {
@@ -6320,6 +6532,8 @@ public void eof() throws SAXException {
                     break eofloop;
                 case COMMENT_START:
                 case COMMENT:
+                case COMMENT_LESSTHAN:
+                case COMMENT_LESSTHAN_BANG:
                     /*
                      * EOF Parse error.
                      */
@@ -6331,6 +6545,7 @@ public void eof() throws SAXException {
                      */
                     break eofloop;
                 case COMMENT_END:
+                case COMMENT_LESSTHAN_BANG_DASH_DASH:
                     errEofInComment();
                     /* Emit the comment token. */
                     emitComment(2, 0);
@@ -6340,6 +6555,7 @@ public void eof() throws SAXException {
                     break eofloop;
                 case COMMENT_END_DASH:
                 case COMMENT_START_DASH:
+                case COMMENT_LESSTHAN_BANG_DASH:
                     errEofInComment();
                     /* Emit the comment token. */
                     emitComment(1, 0);
@@ -6501,7 +6717,6 @@ public void eof() throws SAXException {
                     state = returnState;
                     continue;
                 case CHARACTER_REFERENCE_HILO_LOOKUP:
-                    errNoNamedCharacterMatch();
                     emitOrAppendCharRefBuf(returnState);
                     state = returnState;
                     continue;
@@ -6555,10 +6770,6 @@ public void eof() throws SAXException {
                     }
 
                     if (candidate == -1) {
-                        /*
-                         * If no match can be made, then this is a parse error.
-                         */
-                        errNoNamedCharacterMatch();
                         emitOrAppendCharRefBuf(returnState);
                         state = returnState;
                         continue eofloop;
@@ -6596,7 +6807,6 @@ public void eof() throws SAXException {
                                      * after the U+0026 AMPERSAND (&) must be
                                      * unconsumed, and nothing is returned.
                                      */
-                                    errNoNamedCharacterMatch();
                                     appendCharRefBufToStrBuf();
                                     state = returnState;
                                     continue eofloop;
@@ -6970,7 +7180,7 @@ protected void errGtInPublicId() throws SAXException {
     protected void errNamelessDoctype() throws SAXException {
     }
 
-    protected void errConsecutiveHyphens() throws SAXException {
+    protected void errNestedComment() throws SAXException {
     }
 
     protected void errPrematureEndOfComment() throws SAXException {
@@ -7120,9 +7330,6 @@ protected void errExpectedSystemId() throws SAXException {
     protected void errMissingSpaceBeforeDoctypeName() throws SAXException {
     }
 
-    protected void errHyphenHyphenBang() throws SAXException {
-    }
-
     protected void errNcrControlChar() throws SAXException {
     }
 
diff --git a/src/nu/validator/htmlparser/impl/TreeBuilder.java b/src/nu/validator/htmlparser/impl/TreeBuilder.java
index a81f144a..02cc6409 100644
--- a/src/nu/validator/htmlparser/impl/TreeBuilder.java
+++ b/src/nu/validator/htmlparser/impl/TreeBuilder.java
@@ -391,8 +391,6 @@ public abstract class TreeBuilder<T> implements TokenHandler,
 
     private DoctypeExpectation doctypeExpectation = DoctypeExpectation.HTML;
 
-    private LocatorImpl firstCommentLocation;
-
     // ]NOCPP]
 
     private boolean scriptingEnabled = false;
@@ -614,7 +612,6 @@ final void warn(String message, Locator locator) throws SAXException {
         html4 = false;
         idLocations.clear();
         wantingComments = wantsComments();
-        firstCommentLocation = null;
         // ]NOCPP]
         start(fragment);
         charBufferLen = 0;
@@ -763,22 +760,12 @@ public final void doctype(@Local String name, String publicIdentifier,
                                 publicIdentifier, systemIdentifier, false);
                     } else if (isAlmostStandards(publicIdentifier,
                             systemIdentifier)) {
-                        // [NOCPP[
-                        if (firstCommentLocation != null) {
-                            warn("Comments seen before doctype. Internet Explorer will go into the quirks mode.",
-                                    firstCommentLocation);
-                        }
-                        // ]NOCPP]
                         errAlmostStandardsDoctype();
                         documentModeInternal(
                                 DocumentMode.ALMOST_STANDARDS_MODE,
                                 publicIdentifier, systemIdentifier, false);
                     } else {
                         // [NOCPP[
-                        if (firstCommentLocation != null) {
-                            warn("Comments seen before doctype. Internet Explorer will go into the quirks mode.",
-                                    firstCommentLocation);
-                        }
                         if ((Portability.literalEqualsString(
                                 "-//W3C//DTD HTML 4.0//EN", publicIdentifier) && (systemIdentifier == null || Portability.literalEqualsString(
                                 "http://www.w3.org/TR/REC-html40/strict.dtd",
@@ -821,19 +808,11 @@ public final void doctype(@Local String name, String publicIdentifier,
                                 publicIdentifier, systemIdentifier, true);
                     } else if (isAlmostStandards(publicIdentifier,
                             systemIdentifier)) {
-                        if (firstCommentLocation != null) {
-                            warn("Comments seen before doctype. Internet Explorer will go into the quirks mode.",
-                                    firstCommentLocation);
-                        }
                         err("Almost standards mode doctype. Expected \u201C<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\u201D.");
                         documentModeInternal(
                                 DocumentMode.ALMOST_STANDARDS_MODE,
                                 publicIdentifier, systemIdentifier, true);
                     } else {
-                        if (firstCommentLocation != null) {
-                            warn("Comments seen before doctype. Internet Explorer will go into the quirks mode.",
-                                    firstCommentLocation);
-                        }
                         if ("-//W3C//DTD HTML 4.01//EN".equals(publicIdentifier)) {
                             if (!"http://www.w3.org/TR/html4/strict.dtd".equals(systemIdentifier)) {
                                 warn("The doctype did not contain the system identifier prescribed by the HTML 4.01 specification. Expected \u201C<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\u201D.");
@@ -855,10 +834,6 @@ public final void doctype(@Local String name, String publicIdentifier,
                                 publicIdentifier, systemIdentifier, true);
                     } else if (isAlmostStandards(publicIdentifier,
                             systemIdentifier)) {
-                        if (firstCommentLocation != null) {
-                            warn("Comments seen before doctype. Internet Explorer will go into the quirks mode.",
-                                    firstCommentLocation);
-                        }
                         if ("-//W3C//DTD HTML 4.01 Transitional//EN".equals(publicIdentifier)
                                 && systemIdentifier != null) {
                             if (!"http://www.w3.org/TR/html4/loose.dtd".equals(systemIdentifier)) {
@@ -871,10 +846,6 @@ public final void doctype(@Local String name, String publicIdentifier,
                                 DocumentMode.ALMOST_STANDARDS_MODE,
                                 publicIdentifier, systemIdentifier, true);
                     } else {
-                        if (firstCommentLocation != null) {
-                            warn("Comments seen before doctype. Internet Explorer will go into the quirks mode.",
-                                    firstCommentLocation);
-                        }
                         err("The doctype was not the HTML 4.01 Transitional doctype. Expected \u201C<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\u201D.");
                         documentModeInternal(DocumentMode.STANDARDS_MODE,
                                 publicIdentifier, systemIdentifier, true);
@@ -892,25 +863,11 @@ public final void doctype(@Local String name, String publicIdentifier,
                                 publicIdentifier, systemIdentifier, html4);
                     } else if (isAlmostStandards(publicIdentifier,
                             systemIdentifier)) {
-                        if (firstCommentLocation != null) {
-                            warn("Comments seen before doctype. Internet Explorer will go into the quirks mode.",
-                                    firstCommentLocation);
-                        }
-                        if ("-//W3C//DTD HTML 4.01 Transitional//EN".equals(publicIdentifier)) {
-                            if (!"http://www.w3.org/TR/html4/loose.dtd".equals(systemIdentifier)) {
-                                warn("The doctype did not contain the system identifier prescribed by the HTML 4.01 specification. Expected \u201C<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\u201D.");
-                            }
-                        } else {
-                            err("Almost standards mode doctype. Expected e.g. \u201C<!DOCTYPE html>\u201D.");
-                        }
+                        errAlmostStandardsDoctype();
                         documentModeInternal(
                                 DocumentMode.ALMOST_STANDARDS_MODE,
                                 publicIdentifier, systemIdentifier, html4);
                     } else {
-                        if (firstCommentLocation != null) {
-                            warn("Comments seen before doctype. Internet Explorer will go into the quirks mode.",
-                                    firstCommentLocation);
-                        }
                         if ("-//W3C//DTD HTML 4.01//EN".equals(publicIdentifier)) {
                             if (!"http://www.w3.org/TR/html4/strict.dtd".equals(systemIdentifier)) {
                                 warn("The doctype did not contain the system identifier prescribed by the HTML 4.01 specification. Expected \u201C<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\u201D.");
@@ -984,9 +941,6 @@ public final void comment(@NoLength char[] buf, int start, int length)
             throws SAXException {
         needToDropLF = false;
         // [NOCPP[
-        if (firstCommentLocation == null) {
-            firstCommentLocation = new LocatorImpl(tokenizer);
-        }
         if (!wantingComments) {
             return;
         }
@@ -1566,9 +1520,11 @@ public final void eof() throws SAXException {
                         assert fragment;
                         break eofloop;
                     }
+                    // [NOCPP[
                     if (errorHandler != null) {
-                        errUnclosedElements(eltPos, "template");
+                        errListUnclosedStartTags(0);
                     }
+                    // ]NOCPP]
                     while (currentPtr >= eltPos) {
                         pop();
                     }
@@ -2016,9 +1972,10 @@ public final void startTag(ElementName elementName,
                         case TBODY_OR_THEAD_OR_TFOOT:
                         case TR:
                         case TD_OR_TH:
-                            errStrayStartTag(name);
                             eltPos = findLastInTableScope("caption");
                             if (eltPos == TreeBuilder.NOT_FOUND_ON_STACK) {
+                                assert fragment || isTemplateContents();
+                                errStrayStartTag(name);
                                 break starttagloop;
                             }
                             generateImpliedEndTags();
@@ -2630,7 +2587,7 @@ public final void startTag(ElementName elementName,
                             errFooSeenWhenFooOpen(name);
                             break starttagloop;
                         default:
-                            errBadStartTagInHead(name);
+                            errBadStartTagInNoscriptInHead(name);
                             pop();
                             mode = IN_HEAD;
                             continue;
@@ -3510,9 +3467,11 @@ public final void endTag(ElementName elementName) throws SAXException {
                             mode = IN_TABLE;
                             break endtagloop;
                         case TABLE:
-                            errTableClosedWhileCaptionOpen();
                             eltPos = findLastInTableScope("caption");
+
                             if (eltPos == TreeBuilder.NOT_FOUND_ON_STACK) {
+                                assert fragment || isTemplateContents();
+                                errStrayEndTag(name);
                                 break endtagloop;
                             }
                             generateImpliedEndTags();
@@ -4135,7 +4094,7 @@ private void endTagTemplateInHead() throws SAXException {
             errStrayEndTag("template");
             return;
         }
-        generateImpliedEndTags();
+        generateImpliedEndTagsThoroughly();
         if (errorHandler != null && !isCurrent("template")) {
             errUnclosedElements(eltPos, "template");
         }
@@ -4276,6 +4235,29 @@ private void generateImpliedEndTags() throws SAXException {
         }
     }
 
+    private void generateImpliedEndTagsThoroughly() throws SAXException {
+        for (;;) {
+            switch (stack[currentPtr].getGroup()) {
+                case CAPTION:
+                case COLGROUP:
+                case DD_OR_DT:
+                case LI:
+                case OPTGROUP:
+                case OPTION:
+                case P:
+                case RB_OR_RTC:
+                case RT_OR_RP:
+                case TBODY_OR_THEAD_OR_TFOOT:
+                case TD_OR_TH:
+                case TR:
+                    pop();
+                    continue;
+                default:
+                    return;
+            }
+        }
+    }
+
     private boolean isSecondOnStackBody() {
         return currentPtr >= 1 && stack[1].getGroup() == TreeBuilder.BODY;
     }
@@ -5040,7 +5022,7 @@ void notifyUnusedStackNode(int idxInStackNodes) {
         }
     }
 
-    private StackNode<T> getUnusedStackNode() {
+    @SuppressWarnings("unchecked") private StackNode<T> getUnusedStackNode() {
         // Search for an unused stack node.
         while (stackNodesIdx < numStackNodes) {
             if (stackNodes[stackNodesIdx].isUnused()) {
@@ -6470,7 +6452,7 @@ public int getTemplateModeStackLength() {
      * @throws SAXException
      */
     private void errDeepTree() throws SAXException {
-        err("The document tree is more than 513 elements deep, which causes Firefox and Chrome flatten the tree.");
+        err("The document tree is more than 513 elements deep, which causes Firefox and Chrome to flatten the tree.");
     }
 
     /**
@@ -6605,12 +6587,12 @@ private void errStartTagWithSelectOpen(@Local String name)
                 + "\u201D start tag with \u201Cselect\u201D open.");
     }
 
-    private void errBadStartTagInHead(@Local String name) throws SAXException {
+    private void errBadStartTagInNoscriptInHead(@Local String name) throws SAXException {
         if (errorHandler == null) {
             return;
         }
         errNoCheck("Bad start tag in \u201C" + name
-                + "\u201D in \u201Chead\u201D.");
+                + "\u201D in \u201Cnoscript\u201D in \u201Chead\u201D.");
     }
 
     private void errImage() throws SAXException {
@@ -6621,7 +6603,7 @@ private void errFooSeenWhenFooOpen(@Local String name) throws SAXException {
         if (errorHandler == null) {
             return;
         }
-        errNoCheck("An \u201C" + name + "\u201D start tag seen but an element of the same type was already open.");
+        errNoCheck("Start tag \u201C" + name + "\u201D seen but an element of the same type was already open.");
     }
 
     private void errHeadingWhenHeadingOpen() throws SAXException {
@@ -6703,16 +6685,12 @@ private void errHtmlStartTagInForeignContext(@Local String name)
                 + "\u201D in a foreign namespace context.");
     }
 
-    private void errTableClosedWhileCaptionOpen() throws SAXException {
-        err("\u201Ctable\u201D closed but \u201Ccaption\u201D was still open.");
-    }
-
     private void errNoTableRowToClose() throws SAXException {
         err("No table row to close.");
     }
 
     private void errNonSpaceInTable() throws SAXException {
-        err("Misplaced non-space characters insided a table.");
+        err("Misplaced non-space characters inside a table.");
     }
 
     private void errUnclosedChildrenInRuby() throws SAXException {
diff --git a/src/nu/validator/htmlparser/io/Driver.java b/src/nu/validator/htmlparser/io/Driver.java
index f0b0cc55..d685e69d 100644
--- a/src/nu/validator/htmlparser/io/Driver.java
+++ b/src/nu/validator/htmlparser/io/Driver.java
@@ -197,9 +197,9 @@ public void tokenize(InputSource is) throws SAXException, IOException {
                         tokenizer.getErrorHandler(), tokenizer, this, heuristics);
             } else {
                 if (this.characterEncoding != Encoding.UTF8) {
-                    warnWithoutLocation("Legacy encoding \u201C"
+                    errorWithoutLocation("Legacy encoding \u201C"
                             + this.characterEncoding.getCanonName()
-                            + "\u201D used. Documents should use UTF-8.");
+                            + "\u201D used. Documents must use UTF-8.");
                 }
                 becomeConfident();
                 this.reader = new HtmlInputStreamReader(inputStream,
@@ -416,14 +416,14 @@ public void setHeuristics(Heuristics heuristics) {
      *            the message
      * @throws SAXException
      */
-    protected void warnWithoutLocation(String message) throws SAXException {
+    protected void errorWithoutLocation(String message) throws SAXException {
         ErrorHandler errorHandler = tokenizer.getErrorHandler();
         if (errorHandler == null) {
             return;
         }
         SAXParseException spe = new SAXParseException(message, null,
                 tokenizer.getSystemId(), -1, -1);
-        errorHandler.warning(spe);
+        errorHandler.error(spe);
     }
 
     /**
@@ -588,7 +588,7 @@ public void setXmlnsPolicy(XmlViolationPolicy xmlnsPolicy) {
     }
 
     public String getCharacterEncoding() throws SAXException {
-        return characterEncoding.getCanonName();
+        return characterEncoding == null ? null : characterEncoding.getCanonName();
     }
 
     public Locator getDocumentLocator() {
diff --git a/src/nu/validator/htmlparser/io/HtmlInputStreamReader.java b/src/nu/validator/htmlparser/io/HtmlInputStreamReader.java
index 413f0d9e..3de1af2a 100755
--- a/src/nu/validator/htmlparser/io/HtmlInputStreamReader.java
+++ b/src/nu/validator/htmlparser/io/HtmlInputStreamReader.java
@@ -42,6 +42,7 @@
 
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.Locator;
+import org.xml.sax.ext.Locator2;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
@@ -58,7 +59,7 @@
  * @author hsivonen
  */
 public final class HtmlInputStreamReader extends Reader implements
-        ByteReadable, Locator {
+        ByteReadable, Locator, Locator2 {
 
     private static final int SNIFFING_LIMIT = 1024;
 
@@ -131,9 +132,9 @@ public HtmlInputStreamReader(InputStream inputStream,
             if (encoding == null) {
                 declared = false;
             } else if (encoding != Encoding.UTF8) {
-                warn("Legacy encoding \u201C"
+                err("Legacy encoding \u201C"
                         + encoding.getCanonName()
-                        + "\u201D used. Documents should use UTF-8.");
+                        + "\u201D used. Documents must use UTF-8.");
             }
             if (encoding == null
                     && (heuristics == Heuristics.CHARDET || heuristics == Heuristics.ALL)) {
@@ -160,9 +161,9 @@ public HtmlInputStreamReader(InputStream inputStream,
                     driver.setEncoding(Encoding.UTF8, Confidence.CERTAIN);
                 }
             } else {
-                warn("Legacy encoding \u201C"
+                err("Legacy encoding \u201C"
                         + encoding.getCanonName()
-                        + "\u201D used. Documents should use UTF-8.");
+                        + "\u201D used. Documents must use UTF-8.");
                 if (driver != null) {
                     driver.setEncoding(Encoding.UTF16, Confidence.CERTAIN);
                 }
@@ -452,6 +453,20 @@ public String getSystemId() {
         return null;
     }
 
+    public String getXMLVersion() {
+        if (tokenizer != null) {
+            return tokenizer.getXMLVersion();
+        }
+        return null;
+    }
+
+    public String getEncoding() {
+        if (tokenizer != null) {
+            return tokenizer.getEncoding();
+        }
+        return null;
+    }
+
     /**
      * @param string
      * @throws SAXException
diff --git a/src/nu/validator/htmlparser/io/MetaSniffer.java b/src/nu/validator/htmlparser/io/MetaSniffer.java
index baa04e44..9deaef7a 100755
--- a/src/nu/validator/htmlparser/io/MetaSniffer.java
+++ b/src/nu/validator/htmlparser/io/MetaSniffer.java
@@ -30,10 +30,11 @@
 
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.Locator;
+import org.xml.sax.ext.Locator2;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
-public class MetaSniffer extends MetaScanner implements Locator {
+public class MetaSniffer extends MetaScanner implements Locator, Locator2 {
     
     private Encoding characterEncoding = null;
 
@@ -142,6 +143,20 @@ public String getSystemId() {
         }
         return null;
     }
+
+    public String getXMLVersion() {
+        if (locator != null) {
+            return ((Locator2)locator).getXMLVersion();
+        }
+        return null;
+    }
+
+    public String getEncoding() {
+        if (locator != null) {
+            return ((Locator2)locator).getEncoding();
+        }
+        return null;
+    }
     
     protected boolean tryCharset(String encoding) throws SAXException {
         encoding = Encoding.toAsciiLowerCase(encoding);
diff --git a/src/nu/validator/saxtree/DocumentFragment.java b/src/nu/validator/saxtree/DocumentFragment.java
index 06816932..a9e2db84 100644
--- a/src/nu/validator/saxtree/DocumentFragment.java
+++ b/src/nu/validator/saxtree/DocumentFragment.java
@@ -23,7 +23,7 @@
 
 package nu.validator.saxtree;
 
-import org.xml.sax.helpers.LocatorImpl;
+import nu.validator.htmlparser.impl.LocatorImpl;
 
 /**
  * A document fragment.
diff --git a/src/nu/validator/saxtree/LocatorImpl.java b/src/nu/validator/saxtree/LocatorImpl.java
index 37c0c632..b6416f1a 100644
--- a/src/nu/validator/saxtree/LocatorImpl.java
+++ b/src/nu/validator/saxtree/LocatorImpl.java
@@ -24,13 +24,14 @@
 package nu.validator.saxtree;
 
 import org.xml.sax.Locator;
+import org.xml.sax.ext.Locator2;
 
 /**
  * A locator implementation.
  * @version $Id$
  * @author hsivonen
  */
-public final class LocatorImpl implements Locator {
+public final class LocatorImpl implements Locator, Locator2 {
 
     /**
      * The system id.
@@ -42,6 +43,11 @@ public final class LocatorImpl implements Locator {
      */
     private final String publicId;
     
+    /**
+     * The encoding.
+     */
+    private final String encoding;
+    
     /**
      * The column.
      */
@@ -62,11 +68,17 @@ public LocatorImpl(Locator locator) {
             this.publicId = null;
             this.column = -1;
             this.line = -1;
+            this.encoding = null;
         } else {
             this.systemId = locator.getSystemId();
             this.publicId = locator.getPublicId();
             this.column = locator.getColumnNumber();
             this.line = locator.getLineNumber();
+            if (locator instanceof Locator2) {
+                this.encoding = ((Locator2)locator).getEncoding();
+            } else {
+                this.encoding = null;
+            }
         }
     }
     
@@ -101,4 +113,21 @@ public String getPublicId() {
     public String getSystemId() {
         return systemId;
     }
+
+    /**
+     * 
+     * @see org.xml.sax.ext.Locator2#getXMLVersion()
+     */
+    public String getXMLVersion() {
+        return "1.0";
+    }
+
+    /**
+     * 
+     * @see org.xml.sax.ext.Locator2#getEncoding()
+     */
+    public String getEncoding() {
+        return encoding;
+    }
+
 }
diff --git a/src/nu/validator/saxtree/Node.java b/src/nu/validator/saxtree/Node.java
index 7aed83b7..c9292dd2 100644
--- a/src/nu/validator/saxtree/Node.java
+++ b/src/nu/validator/saxtree/Node.java
@@ -27,6 +27,7 @@
 
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
+import org.xml.sax.ext.Locator2;
 import org.xml.sax.SAXException;
 
 /**
@@ -34,7 +35,7 @@
  * @version $Id$
  * @author hsivonen
  */
-public abstract class Node implements Locator {
+public abstract class Node implements Locator, Locator2 {
 
     /**
      * The system id.
@@ -45,6 +46,11 @@ public abstract class Node implements Locator {
      * The public id.
      */
     private final String publicId;
+
+    /**
+     * The encoding.
+     */
+    private final String encoding;
     
     /**
      * The column.
@@ -75,6 +81,7 @@ public abstract class Node implements Locator {
         if (locator == null) {
             this.systemId = null;
             this.publicId = null;
+            this.encoding = null;
             this.column = -1;
             this.line = -1;
         } else {
@@ -82,6 +89,11 @@ public abstract class Node implements Locator {
             this.publicId = locator.getPublicId();
             this.column = locator.getColumnNumber();
             this.line = locator.getLineNumber();
+            if (locator instanceof Locator2) {
+                this.encoding = ((Locator2)locator).getEncoding();
+            } else {
+                this.encoding = null;
+            }
         }
     }
     
@@ -117,6 +129,20 @@ public String getSystemId() {
         return systemId;
     }
 
+    /**
+     * @see org.xml.sax.ext.Locator2#getXMLVersion()
+     */
+    public String getXMLVersion() {
+        return "1.0";
+    }
+
+    /**
+     * @see org.xml.sax.ext.Locator2#getEncoding
+     */
+    public String getEncoding() {
+        return encoding;
+    }
+
     /**
      * Visit the node.
      * 
diff --git a/src/nu/validator/saxtree/TreeParser.java b/src/nu/validator/saxtree/TreeParser.java
index a9d92deb..6f86f7f0 100644
--- a/src/nu/validator/saxtree/TreeParser.java
+++ b/src/nu/validator/saxtree/TreeParser.java
@@ -26,6 +26,7 @@
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.Locator;
+import org.xml.sax.ext.Locator2;
 import org.xml.sax.SAXException;
 import org.xml.sax.ext.LexicalHandler;
 
@@ -34,7 +35,7 @@
  * @version $Id$
  * @author hsivonen
  */
-public final class TreeParser implements Locator {
+public final class TreeParser implements Locator, Locator2 {
     
     /**
      * The content handler.
@@ -283,7 +284,6 @@ public String getPublicId() {
         if (locatorDelegate == null) {
             return null;
         } else {
-
             return locatorDelegate.getPublicId();
         }
     }
@@ -298,4 +298,26 @@ public String getSystemId() {
             return locatorDelegate.getSystemId();
         }
     }
+
+    /**
+     * @see org.xml.sax.Locator#getSystemId()
+     */
+    public String getXMLVersion() {
+        if (!(locatorDelegate instanceof Locator2)) {
+            return null;
+        } else {
+            return ((Locator2)locatorDelegate).getXMLVersion();
+        }
+    }
+
+    /**
+     * @see org.xml.sax.Locator#getSystemId()
+     */
+    public String getEncoding() {
+        if (!(locatorDelegate instanceof Locator2)) {
+            return null;
+        } else {
+            return ((Locator2)locatorDelegate).getEncoding();
+        }
+    }
 }