diff --git a/42sh/scriptheader.sh b/42sh/scriptheader.sh
index e2c1f881..aec703b0 100755
--- a/42sh/scriptheader.sh
+++ b/42sh/scriptheader.sh
@@ -58,8 +58,11 @@ do_checkout ()
 	i_tmp=$(echo $i | sed 's/\//_/g')
 	cp $i "$HOME/Documents/.$i_tmp.back"
 	git checkout $i
-	echo "$gre D - O - N - E $res"
-	echo "$cya $i was checked out. A copy still exist in $HOME/Documents/.$i_tmp.back$res\n"
+	if [ $verbose -eq 1 ]
+	then
+		echo "$gre D - O - N - E $res"
+		echo "$cya $i was checked out. A copy still exist in $HOME/Documents/.$i_tmp.back$res\n"
+	fi
 }
 
 if [ $verbose -eq 1 ]
diff --git a/42sh/src/exec/plaunch_builtin.c b/42sh/src/exec/plaunch_builtin.c
index f67b753c..93960d1a 100644
--- a/42sh/src/exec/plaunch_builtin.c
+++ b/42sh/src/exec/plaunch_builtin.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jhalford@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/03/07 15:48:24 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/21 18:10:21 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/03/24 14:56:11 by wescande         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,8 +14,9 @@
 
 int		plaunch_builtin(t_process *p)
 {
-	return (*p->data.cmd.execf)(
+	set_exitstatus((*p->data.cmd.execf)(
 				p->data.cmd.path,
 				p->data.cmd.av,
-				data_singleton()->env);
+				data_singleton()->env), 1);
+	return (0);
 }
diff --git a/42sh/src/exec/process_launch.c b/42sh/src/exec/process_launch.c
index 5843705c..b044bdbd 100644
--- a/42sh/src/exec/process_launch.c
+++ b/42sh/src/exec/process_launch.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jhalford@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/03/13 22:21:19 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/22 18:26:53 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/03/24 14:56:32 by wescande         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -41,7 +41,7 @@ int		process_launch(t_process *p)
 		if (process_redirect(p))
 			set_exitstatus(1, 1);
 		else
-			set_exitstatus(p->map.launch(p), 1);
+			p->map.launch(p);
 		shell_resetfds();
 		shell_resetsig();
 		process_free(p, 0);