diff --git a/include/execution.h b/include/execution.h
index 7ca74a8..8265582 100644
--- a/include/execution.h
+++ b/include/execution.h
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/29 13:20:22 by mmoussou          #+#    #+#             */
-/*   Updated: 2024/07/13 14:03:47 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/07/14 15:49:21 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -36,6 +36,7 @@ char	*get_cmd_local_path(char *cmd, t_env *env);
 void	print_return_value(int return_code);
 void	__wait(int i);
 void	__close(void *content);
+int		check_file(char *cmd, char *input);
 
 /**
  * @brief				spawn a heredoc
diff --git a/src/exec/exec_split_cmd.c b/src/exec/exec_split_cmd.c
index 90ba1a1..7615cb3 100644
--- a/src/exec/exec_split_cmd.c
+++ b/src/exec/exec_split_cmd.c
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/01 14:55:06 by mmoussou          #+#    #+#             */
-/*   Updated: 2024/07/14 14:44:18 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/07/14 15:48:41 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -70,10 +70,10 @@ int	exec_single_cmd(t_cmd *cmd, char **env, t_env *env_t, int pipe_fd[2])
 	exec.pipe_fd[0] = pipe_fd[0];
 	exec.pipe_fd[1] = pipe_fd[1];
 	exec.status = switch_cmd_path(cmd, env_t);
-	if (exec.status == -1 || !input || (access(cmd->cmd, X_OK) \
-		&& !is_in_builtins(cmd->cmd)))
+	if (exec.status == -1 || !input || check_file(cmd->cmd, input))
 	{
-		printf("minishell : command not found: %s$\n", input);
+		if (exec.status == -1)
+			printf("minishell : command not found: %s\n", input);
 		free(input);
 		return (-1);
 	}
diff --git a/src/exec/utils_exec.c b/src/exec/utils_exec.c
index 45aa5bd..ab6e148 100644
--- a/src/exec/utils_exec.c
+++ b/src/exec/utils_exec.c
@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/09 19:25:18 by adjoly            #+#    #+#             */
-/*   Updated: 2024/07/10 01:17:11 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/07/14 15:49:04 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -89,3 +89,25 @@ int	switch_cmd_path(t_cmd *cmd, t_env *env)
 		return (-1);
 	return (0);
 }
+
+int	check_file(char *cmd, char *input)
+{
+	struct stat	entry;
+	int			status;
+
+	if (is_in_builtins(cmd))
+		return (0);
+	status = stat(cmd, &entry);
+	if (status)
+	{
+		printf("minishell : command not found: %s\n", input);
+		return (1);
+	}
+	if (!S_ISDIR(entry.st_mode) && !access(cmd, X_OK))
+		return (0);
+	if (S_ISDIR(entry.st_mode))
+		printf("minishell : %s is a directory.\n", input);
+	else
+		printf("minishell : command not found: %s\n", input);
+	return (1);
+}