2 files changed, 17 insertions, 3 deletions
diff --git a/src/postamble.js b/src/postamble.js
index cb0521aa..4943b9e8 100644
--- a/src/postamble.js
+++ b/src/postamble.js
@@ -21,6 +21,8 @@ Module.callMain = function callMain(args) {
 }
 
 function run(args) {
+  args = args || Module.arguments;
+
   __initializeRuntime__();
 
   var globalFuncs = [];
@@ -39,8 +41,13 @@ Module['run'] = run;
 // {{PRE_RUN_ADDITIONS}}
 
 #if INVOKE_RUN
-run(args);
+#else
+Module.noInitialRun = true;
 #endif
 
+if (!Module.noInitialRun) {
+  run();
+}
+
 // {{POST_RUN_ADDITIONS}}
 
diff --git a/src/shell.js b/src/shell.js
index 3b762e18..f18fc3ca 100644
--- a/src/shell.js
+++ b/src/shell.js
@@ -6,8 +6,15 @@
 //  args = args || [];
 
 // Runs much faster, for some reason
-this['Module'] = {};
-var args = arguments;
+if (!this['Module']) {
+  this['Module'] = {};
+}
+try {
+  Module.arguments = arguments;
+} catch(e) {
+  Module.arguments = [];
+}
+
   {{BODY}}
 
   // {{MODULE_ADDITIONS}}