diff --git a/lib/extension-es6.js b/lib/extension-es6.js
index e034fd91..ba0a135a 100644
--- a/lib/extension-es6.js
+++ b/lib/extension-es6.js
@@ -17,6 +17,7 @@ function es6(loader) {
   var nodeResolver = typeof process != 'undefined' && typeof require != 'undefined' && require.resolve;
 
   function configNodeGlobal(loader, module, nodeModule, wilcardDummy) {
+    loader.meta = loader.meta || {};
     var meta = loader.meta[module] = loader.meta[module] || {};
     meta.format = meta.format || 'global';
     if (!loader.paths[module]) {
diff --git a/test/test-tracer.html b/test/test-tracer.html
index 20413bc3..6360cba3 100644
--- a/test/test-tracer.html
+++ b/test/test-tracer.html
@@ -14,7 +14,7 @@
     <div id="qunit-test-area"></div>
 
     <script src="../node_modules/es6-module-loader/dist/es6-module-loader.js"></script>
-    <script src="../dist/system.js" type="text/javascript"></script>
+    <script src="../dist/system.src.js" type="text/javascript"></script>
 
     <script src="../bower_components/qunit/qunit/qunit.js"></script>
 
@@ -27,7 +27,7 @@
 
       function err(e) {
         setTimeout(function() {
-          throw e;
+          throw e.stack || e;
           start();
         });  
       }