diff --git a/src/UpdateInstaller.cpp b/src/UpdateInstaller.cpp
index 13a161d..cf4a516 100644
--- a/src/UpdateInstaller.cpp
+++ b/src/UpdateInstaller.cpp
@@ -89,8 +89,11 @@ void UpdateInstaller::run() throw ()
 
 	if (m_mode == Setup)
 	{
-		LOG(Info,"Waiting for main app process to finish");
-		ProcessUtils::waitForProcess(m_waitPid);
+		if (m_waitPid != 0)
+		{
+			LOG(Info,"Waiting for main app process to finish");
+			ProcessUtils::waitForProcess(m_waitPid);
+		}
 
 		std::list<std::string> args = updaterArgs();
 		args.push_back("--mode");