diff --git a/42sh/file b/42sh/file
new file mode 100644
index 00000000..8d275c1b
--- /dev/null
+++ b/42sh/file
@@ -0,0 +1,17 @@
+42ShellTester
+42sh
+Makefile
+README.md
+STDBUG
+auteur
+donovan_segaults_06-02
+file
+includes
+libft
+objs
+pdf
+sample
+scriptheader.sh
+src
+test
+update_makefile.sh
diff --git a/42sh/src/main/main.c b/42sh/src/main/main.c
index f07ed64f..aa624bd2 100644
--- a/42sh/src/main/main.c
+++ b/42sh/src/main/main.c
@@ -6,7 +6,7 @@
 /*   By: gwojda <gwojda@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/03/20 14:45:40 by gwojda            #+#    #+#             */
-/*   Updated: 2017/03/27 18:28:37 by ariard           ###   ########.fr       */
+/*   Updated: 2017/03/27 20:57:57 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -46,7 +46,6 @@ static int		handle_instruction(t_list **token, t_btree **ast)
 			return (ret);
 		if (do_lexer_routine(token, stream) > 0)
 			continue ;
-		token_print(*token);
 		if ((ret = do_parser_routine(token, ast)) == 1
 				&& SH_NO_INTERACTIVE(data->opts))
 			return (ret);
diff --git a/42sh/src/parser/do_parser_routine.c b/42sh/src/parser/do_parser_routine.c
index 98e90df2..69f74340 100644
--- a/42sh/src/parser/do_parser_routine.c
+++ b/42sh/src/parser/do_parser_routine.c
@@ -6,7 +6,7 @@
 /*   By: wescande <wescande@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/03/19 14:24:14 by wescande          #+#    #+#             */
-/*   Updated: 2017/03/21 21:38:36 by ariard           ###   ########.fr       */
+/*   Updated: 2017/03/27 21:02:08 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,9 +21,11 @@ int		do_parser_routine(t_list **token, t_btree **ast)
 		return (1);
 	if (data->parser.state == SUCCESS && stack_init(&data->parser))
 		exit(1);
+	token_print(*token);
 	if (ft_parse(ast, token, &data->parser))
 		exit(1);
-	if ((data->lexer.state = data->parser.heredoc_queue ? HEREDOC : DEFAULT))
+	if (data->parser.state != ERROR && 
+		(data->lexer.state = data->parser.heredoc_queue ? HEREDOC : DEFAULT))
 		return (0);
 	if (data->parser.state == ERROR)
 	{
diff --git a/42sh/src/parser/eval_sym.c b/42sh/src/parser/eval_sym.c
index 94747a30..e7b153d3 100644
--- a/42sh/src/parser/eval_sym.c
+++ b/42sh/src/parser/eval_sym.c
@@ -6,7 +6,7 @@
 /*   By: ariard <ariard@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/03/11 16:11:21 by ariard            #+#    #+#             */
-/*   Updated: 2017/03/27 17:29:01 by ariard           ###   ########.fr       */
+/*   Updated: 2017/03/27 21:03:04 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */