diff --git a/src/stub_launcher.cc b/src/stub_launcher.cc
index 9dc2a64a..828228e6 100644
--- a/src/stub_launcher.cc
+++ b/src/stub_launcher.cc
@@ -787,7 +787,11 @@ StubLauncher::WaitForStubProcess()
   CloseHandle(stub_pid_.hThread);
 #else
   int status;
-  waitpid(stub_pid_, &status, 0);
+  if (stub_pid_ != 0) {
+    // Added this check to ensure server doesn't hang waiting after stub
+    // process has already be killed and cannot be waited on
+    waitpid(stub_pid_, &status, 0);
+  }
 #endif
 }