diff --git a/lib/ace/mode/html.js b/lib/ace/mode/html.js
index 6014f02b..bc85dd5e 100644
--- a/lib/ace/mode/html.js
+++ b/lib/ace/mode/html.js
@@ -74,6 +74,8 @@ oop.inherits(Mode, TextMode);
     };
 
     this.createWorker = function(session) {
+        if (this.constructor != Mode)
+            return;
         var worker = new WorkerClient(["ace"], "ace/mode/html_worker", "Worker");
         worker.attachToDocument(session.getDocument());
 
diff --git a/lib/ace/mode/html/saxparser.js b/lib/ace/mode/html/saxparser.js
index a15663f8..966630d5 100644
--- a/lib/ace/mode/html/saxparser.js
+++ b/lib/ace/mode/html/saxparser.js
@@ -1,4 +1,4 @@
-define(function(require, exports, module){
+define(["require", "exports", "module"], function(require, exports, module){
 require=(function(e,t,n){function i(n,s){if(!t[n]){if(!e[n]){var o=typeof require=="function"&&require;if(!s&&o)return o(n,!0);if(r)return r(n,!0);throw new Error("Cannot find module '"+n+"'")}var u=t[n]={exports:{}};e[n][0].call(u.exports,function(t){var r=e[n][1][t];return i(r?r:t)},u,u.exports)}return t[n].exports}var r=typeof require=="function"&&require;for(var s=0;s<n.length;s++)i(n[s]);return i})({1:[function(require,module,exports){
 function isScopeMarker(node) {
 	if (node.namespaceURI === "http://www.w3.org/1999/xhtml") {
@@ -5212,7 +5212,7 @@ TreeBuilder.prototype.parseError = function(code, args, isWarning) {
 	if (!this.errorHandler)
 		return;
 	var message = formatMessage(messages[code], args);
-	this.errorHandler.error(message, this.tokenizer._inputStream.location());
+	this.errorHandler.error(message, this.tokenizer._inputStream.location(), code);
 };
 
 /**
diff --git a/lib/ace/mode/html_worker.js b/lib/ace/mode/html_worker.js
index 65827e84..742c1045 100644
--- a/lib/ace/mode/html_worker.js
+++ b/lib/ace/mode/html_worker.js
@@ -36,6 +36,12 @@ var lang = require("../lib/lang");
 var Mirror = require("../worker/mirror").Mirror;
 var SAXParser = require("./html/saxparser").SAXParser;
 
+var errorTypes = {
+    "expected-doctype-but-got-start-tag": "info",
+    "expected-doctype-but-got-chars": "info",
+    "non-html-root": "info",
+}
+
 var Worker = exports.Worker = function(sender) {
     Mirror.call(this, sender);
     this.setTimeout(400);
@@ -65,12 +71,12 @@ oop.inherits(Worker, Mirror);
            characters: noop
         };
         parser.errorHandler = {
-            error: function(message, location) {
+            error: function(message, location, code) {
                 errors.push({
                     row: location.line,
                     column: location.column,
                     text: message,
-                    type: "error"
+                    type: errorTypes[code] || "error"
                 });
             }
         };