diff --git a/examples/cwd.js b/examples/cwd.js
new file mode 100644
index 00000000..b50eacd0
--- /dev/null
+++ b/examples/cwd.js
@@ -0,0 +1,4 @@
+
+console.log(process.env.PWD);
+console.log(process.cwd());
+console.log(__dirname);
diff --git a/lib/ProcessContainer.js b/lib/ProcessContainer.js
index 31281146..e2b6ab53 100644
--- a/lib/ProcessContainer.js
+++ b/lib/ProcessContainer.js
@@ -5,11 +5,12 @@
 var fs = require('fs');
 var p = require('path');
 var cst = require('../constants');
+var worker  = require('cluster').worker;
+
 require('coffee-script');
 
 (function ProcessContainer() {
   var fs      = require('fs');
-  var worker  = require('cluster').worker;  
   
   var outFile = process.env.pm_out_log_path;
   var errFile = process.env.pm_err_log_path;
@@ -23,10 +24,10 @@ require('coffee-script');
   var cronRestart = process.env.cron_restart;
 
   fs.writeFileSync(pidFile, process.pid);
-  process.on('exit', function () {
-      fs.unlinkSync(pidFile);
-  });
-
+  //  process.on('exit', function () {
+  //   fs.unlinkSync(pidFile);
+  // });
+  
   // Add args to process if args specified on start
   if (process.env.args != null)
     process.argv = process.argv.concat(eval(process.env.args));
@@ -58,7 +59,7 @@ function cronize(cron_pattern) {
 
 function exec(script, outFile, errFile) {
   // Change dir to fix process.cwd
-  //process.chdir(p.dirname(script));
+  process.chdir(process.env.PWD);
 
   var stderr, stdout;
 
@@ -81,10 +82,11 @@ function exec(script, outFile, errFile) {
                                 };
                               })(process.stdout.write);
 
-      process.on('uncaughtException', function(err) {
-        stderr.write(err.stack);
-        process.exit(1);
-      });
+      // process.on('uncaughtException', function(err) {
+      //   stderr.write(err.stack);
+      //   process.exit(1);
+      // });
+
 
       // Get the script & exec
       require(script);
diff --git a/package.json b/package.json
index 934daf2d..cfe0d7f8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pm2",
   "preferGlobal": "true",
-  "version": "0.5.8",
+  "version": "0.5.9",
   "engines" : {
     "node" : ">=0.8"
   },