Merge branch 'v0.6'

Conflicts:
	src/handle_wrap.cc
	src/node_zlib.cc
	src/process_wrap.cc

1 files changed, 8 insertions, 6 deletions

diff --git a/src/process_wrap.cc b/src/process_wrap.cc
index 847a76352f..5c4282ffb0 100644
--- a/src/process_wrap.cc
+++ b/src/process_wrap.cc
@@ -178,10 +178,14 @@ class ProcessWrap : public HandleWrap {
 
     int r = uv_spawn(Loop(), &wrap->process_, options);
 
-    wrap->SetHandle((uv_handle_t*)&wrap->process_);
-    assert(wrap->process_.data == wrap);
-
-    wrap->object_->Set(String::New("pid"), Integer::New(wrap->process_.pid));
+    if (r) {
+      SetErrno(uv_last_error(Loop()));
+    }
+    else {
+      wrap->SetHandle((uv_handle_t*)&wrap->process_);
+      assert(wrap->process_.data == wrap);
+      wrap->object_->Set(String::New("pid"), Integer::New(wrap->process_.pid));
+    }
 
     if (options.args) {
       for (int i = 0; options.args[i]; i++) free(options.args[i]);
@@ -196,8 +200,6 @@ class ProcessWrap : public HandleWrap {
       delete [] options.env;
     }
 
-    if (r) SetErrno(uv_last_error(Loop()));
-
     return scope.Close(Integer::New(r));
   }