diff --git a/42sh/includes/builtin.h b/42sh/includes/builtin.h
index 7cf32cda..03d9e385 100644
--- a/42sh/includes/builtin.h
+++ b/42sh/includes/builtin.h
@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/03/14 22:59:57 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/14 22:59:57 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/03/14 23:25:30 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/42sh/src/exec/plaunch_file.c b/42sh/src/exec/plaunch_file.c
index 62abe0ad..211cfc75 100644
--- a/42sh/src/exec/plaunch_file.c
+++ b/42sh/src/exec/plaunch_file.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/03/07 14:53:31 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/14 22:34:06 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/03/14 23:30:54 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/42sh/src/job-control/job_update_status.c b/42sh/src/job-control/job_update_status.c
index c70d1f75..6432d8bc 100644
--- a/42sh/src/job-control/job_update_status.c
+++ b/42sh/src/job-control/job_update_status.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/15 12:56:11 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/13 14:53:33 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/03/14 23:43:00 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/42sh/src/job-control/job_wait.c b/42sh/src/job-control/job_wait.c
index acefe6f1..3033978a 100644
--- a/42sh/src/job-control/job_wait.c
+++ b/42sh/src/job-control/job_wait.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/15 11:49:05 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/13 17:36:32 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/03/14 23:43:12 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -24,7 +24,8 @@ int		job_wait(int id)
 	DG("job wait id=[%i], pgid=[%i]", id, j->pgid);
 	do
 	{
-		if ((pid = waitpid(-j->pgid, &status, WUNTRACED)) == -1)
+		if ((pid = waitpid(-j->pgid, &status, WUNTRACED)) == -1
+				&& errno != ECHILD)
 			ft_dprintf(2, "{red}%s: waitpid error errno=%i{eoc}\n", SHELL_NAME, errno);
 		DG("waitpid->[%d]", pid);
 	}
diff --git a/42sh/src/main/shell_init.c b/42sh/src/main/shell_init.c
index a03ef260..ca14c64e 100644
--- a/42sh/src/main/shell_init.c
+++ b/42sh/src/main/shell_init.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jhalford@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/12 17:23:59 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/14 22:21:28 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/03/14 23:25:40 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */