diff --git a/src/loader.js b/src/loader.js index 889ed89..f5017eb 100644 --- a/src/loader.js +++ b/src/loader.js @@ -260,7 +260,7 @@ function logloads(loads) { // store the deps as load.deps load.declare = declare; load.depsList = deps; - } + } __eval(transpiled, __global, load); curSystem.register = curRegister; }); @@ -512,10 +512,11 @@ function logloads(loads) { function linkSetFailed(linkSet, load, exc) { var loader = linkSet.loader; - if (linkSet.loads[0].name != load.name) + if (load && linkSet.loads[0].name != load.name) exc = addToError(exc, 'Error loading "' + load.name + '" from "' + linkSet.loads[0].name + '" at ' + (linkSet.loads[0].address || '') + '\n'); - exc = addToError(exc, 'Error loading "' + load.name + '" at ' + (load.address || '') + '\n'); + if (load) + exc = addToError(exc, 'Error loading "' + load.name + '" at ' + (load.address || '') + '\n'); var loads = linkSet.loads.concat([]); for (var i = 0, l = loads.length; i < l; i++) {