JavaScriptExample
diff --git a/‎lib/HotModuleReplacementPlugin.js‎
Lines changed: 27 additions & 7 deletions b/‎lib/HotModuleReplacementPlugin.js‎
Lines changed: 27 additions & 7 deletions
diff --git a/‎test/cases/parsing/hot-error-handler/index.js‎
Lines changed: 7 additions & 0 deletions b/‎test/cases/parsing/hot-error-handler/index.js‎
Lines changed: 7 additions & 0 deletions
@@ -232,6 +232,8 @@ var hotInitCode = Template.getFunctionContent(function() {
 			accept: function(dep, callback) {
 				if(typeof dep === "undefined")
 					hot._selfAccepted = true;
+				else if(typeof dep === "function")
+					hot._selfAccepted = dep;
 				else if(typeof dep === "number")
 					hot._acceptedDependencies[dep] = callback;
 				else for(var i = 0; i < dep.length; i++)
@@ -414,7 +416,10 @@ var hotInitCode = Template.getFunctionContent(function() {
 		for(var i = 0; i < outdatedModules.length; i++) {
 			var moduleId = outdatedModules[i];
 			if(installedModules[moduleId] && installedModules[moduleId].hot._selfAccepted)
-				outdatedSelfAcceptedModules.push(moduleId);
+				outdatedSelfAcceptedModules.push({
+					module: moduleId,
+					errorHandler: installedModules[moduleId].hot._selfAccepted
+				});
 		}
 
 		// Now in "dispose" phase
@@ -496,16 +501,31 @@ var hotInitCode = Template.getFunctionContent(function() {
 				}
 			}
 		}
-		if(error) {
-			hotSetStatus("fail");
-			return callback(error);
-		}
 
 		// Load self accepted modules
 		for(var i = 0; i < outdatedSelfAcceptedModules.length; i++) {
-			var moduleId = outdatedSelfAcceptedModules[i];
+			var item = outdatedSelfAcceptedModules[i];
+			var moduleId = item.module;
 			hotCurrentParent = moduleId;
-			$require$(moduleId);
+			try {
+				$require$(moduleId);
+			} catch(err) {
+				if(typeof item.errorHandler === "function") {
+					try {
+						item.errorHandler(err);
+					} catch(err) {
+						if(!error)
+							error = err;
+					}
+				} else if(!error)
+					error = err;
+			}
+		}
+
+		// handle errors in accept handlers and self accepted module load
+		if(error) {
+			hotSetStatus("fail");
+			return callback(error);
 		}
 
 		hotSetStatus("idle");
 
@@ -0,0 +1,7 @@
+if(module.hot) {
+	it("should parse a self accept with error handler", function() {
+		module.hot.accept(function(err) {
+		
+		});
+	});
+}