diff --git a/src/syscall/process.rs b/src/syscall/process.rs
index d396be205d84f9ffdd910697b269f5a196893bfa..8b709e7a24b8d67028a65bb5c5a88d9cffa25fbc 100644
--- a/src/syscall/process.rs
+++ b/src/syscall/process.rs
@@ -1160,20 +1160,18 @@ pub fn waitpid(pid: ContextId, status_ptr: usize, flags: usize) -> Result<Contex
     } else {
         let status = {
             let contexts = context::contexts();
-            if let Some(context_lock) = contexts.get(pid) {
-                let mut context = context_lock.write();
-                if context.ppid != ppid {
-                    println!("Hack for rustc - changing ppid of {} from {} to {}", context.id.into(), context.ppid.into(), ppid.into());
-                    context.ppid = ppid;
-                    //return Err(Error::new(ECHILD));
-                }
-                Some(context.status.clone())
-            } else {
-                None
+            let context_lock = contexts.get(pid).ok_or(Error::new(ECHILD))?;
+            let mut context = context_lock.write();
+            if context.ppid != ppid {
+                println!("Hack for rustc - changing ppid of {} from {} to {}", context.id.into(), context.ppid.into(), ppid.into());
+                context.ppid = ppid;
+                //return Err(Error::new(ECHILD));
             }
+            context.status.clone()
         };
 
-        if let Some(context::Status::Exited(status)) = status {
+        if let context::Status::Exited(status) = status {
+            let _ = waitpid.receive_nonblock(&pid);
             status_slice[0] = status;
             reap(pid)
         } else if flags & WNOHANG == WNOHANG {