diff --git a/includes/minishell.h b/includes/minishell.h
index 144f186..57addc9 100644
--- a/includes/minishell.h
+++ b/includes/minishell.h
@@ -37,5 +37,6 @@ int					exec_cmd(char **argv, t_env **env);
 void				*ft_strdel_null(char **s);
 
 void				*put_error_cd(char *file, char *msg);
+int					put_error_cd2(char *file, char *msg);
 
 #endif
diff --git a/srcs/cmd_cd.c b/srcs/cmd_cd.c
index 3374ab4..326927b 100644
--- a/srcs/cmd_cd.c
+++ b/srcs/cmd_cd.c
@@ -12,24 +12,6 @@
 
 #include "minishell.h"
 
-void	*put_error_cd(char *file, char *msg)
-{
-	ft_putstr("cd: ");
-	ft_putstr(file);
-	ft_putstr(": ");
-	ft_putendl(msg);
-	return (NULL);
-}
-
-int		put_error_cd2(char *file, char *msg)
-{
-	ft_putstr("cd: ");
-	ft_putstr(file);
-	ft_putstr(": ");
-	ft_putendl(msg);
-	return (1);
-}
-
 char	*check_path_slash_cd(char *exec)
 {
 	int			i;
diff --git a/srcs/ms_ext.c b/srcs/ms_ext.c
index cca3f20..1292591 100644
--- a/srcs/ms_ext.c
+++ b/srcs/ms_ext.c
@@ -104,6 +104,12 @@ char	**res_ext(char **av, t_env *env)
 			else if (av[i[0]][i[1]] == '~' && (tmp = ft_envgetelem("HOME", env))
 				!= NULL && (ret = replace_env(av[i[0]], tmp, 1, i[1])) != NULL)
 				ft_strreplace(&av[i[0]], ret, &i[1], tmp);
+			else if (av[i[0]][i[1]] == '~' && (tmp = ft_envgetelem("HOME", env))
+				== NULL)
+			{
+				ft_printf("Entry %s not found\n", "HOME");
+				return (NULL);
+			}
 			else if (av[i[0]][i[1]] == '$'
 				&& resolve_complete_key(&av[i[0]], &i[1], env) == NULL)
 				return (NULL);
diff --git a/srcs/put_error_cd.c b/srcs/put_error_cd.c
index b2d7d0d..095e4d9 100644
--- a/srcs/put_error_cd.c
+++ b/srcs/put_error_cd.c
@@ -20,3 +20,12 @@ void	*put_error_cd(char *file, char *msg)
 	ft_putendl(msg);
 	return (NULL);
 }
+
+int		put_error_cd2(char *file, char *msg)
+{
+	ft_putstr("cd: ");
+	ft_putstr(file);
+	ft_putstr(": ");
+	ft_putendl(msg);
+	return (1);
+}