diff --git a/env2.c b/env2.c
index 0a93049..76f0008 100644
--- a/env2.c
+++ b/env2.c
@@ -1,4 +1,3 @@
-/* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
 /*   env2.c                                             :+:      :+:    :+:   */
@@ -10,6 +9,7 @@
 /*                                                                            */
 /* ************************************************************************** */
 
+#include "libftx/libftx.h"
 #include "minishell.h"
 
 int	get_index(char *s, char c)
@@ -46,10 +46,15 @@ void	env_del(void *ptr)
 {
 	t_env	*content;
 
+	if (ptr == NULL)
+		return ;
 	content = ptr;
-	free(content->key);
-	free(content->value);
-	free(content);
+	if (content->key != NULL)
+		free(content->key);
+	if (content->key != NULL)
+		free(content->value);
+	if (content != NULL)
+		free(content);
 }
 
 char	**env_to_strs(t_list **head)
diff --git a/env3.c b/env3.c
index 3be208a..3c69c62 100644
--- a/env3.c
+++ b/env3.c
@@ -6,10 +6,11 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/17 17:25:09 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/02/17 17:31:31 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/02/21 14:09:42 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
+#include "libftx/libftx.h"
 #include "minishell.h"
 
 char	*get_value(char *str)
@@ -37,3 +38,26 @@ char	*get_key(char *str)
 		s[i] = str[i];
 	return (s);
 }
+
+int	create_value_by_key_dup(char *key, char *value, t_list **env)
+{
+	char	*key_dup;
+	char	*value_dup;
+
+	key_dup = ft_strdup(key);
+	if (key_dup == NULL)
+	{
+		ft_eprintf("minishell: malloc failed\n");
+		return (1);
+	}
+	value_dup = ft_strdup(value);
+	if (value_dup == NULL)
+	{
+		free(key);
+		ft_eprintf("minishell: malloc failed\n");
+		return (1);
+	}
+	if (create_value_by_key(key_dup, value_dup, env))
+		return (1);
+	return (0);
+}
diff --git a/main.c b/main.c
index 04dd84e..b67da56 100644
--- a/main.c
+++ b/main.c
@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/16 15:16:14 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/20 15:24:42 by starnakin        ###   ########.fr       */
+/*   Updated: 2023/02/21 14:24:45 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -108,7 +108,13 @@ int	main(int ac, char **av, char **env)
 	data.env = init_env(env);
 	if (data.env == NULL)
 		return (1);
-	create_value_by_key("", "$", data.env);
+	if (create_value_by_key_dup("", "$", data.env) == 1
+		|| create_value_by_key_dup("?", "0", data.env) == 1)
+	{
+		ft_lstclear(data.env, env_del);
+		free(data.env);
+		return (1);
+	}
 	line = ft_get_user_input(data.env);
 	if (line == NULL)
 	{