diff --git a/src/main.c b/src/main.c
index af43476..68e372a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,7 +6,7 @@
 /*   By: qmennen <qmennen@student.codam.nl>           +#+                     */
 /*                                                   +#+                      */
 /*   Created: 2025/04/15 16:01:29 by qmennen       #+#    #+#                 */
-/*   Updated: 2025/04/20 13:46:26 by whaffman      ########   odam.nl         */
+/*   Updated: 2025/04/20 14:25:22 by whaffman      ########   odam.nl         */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -35,8 +35,11 @@ int	main(int argc, char **argv)
 
 	errno = 0;
 	game = NULL;
-	init_game(&game, argc, argv);
-	perror("after init");
+	if (!init_game(&game, argc, argv))
+	{
+		ft_putstr_fd("Error initializing game\n", 2);
+		return (EXIT_FAILURE);
+	}
 	mlx_loop(game->screen->mlx);
 	game_terminate(game);
 	return (EXIT_SUCCESS);
diff --git a/src/map.c b/src/map.c
index 8460833..51350bb 100644
--- a/src/map.c
+++ b/src/map.c
@@ -148,6 +148,7 @@ int enclosed_map(t_map *map)
 	return SUCCESS;
 }
 
+
 // int main(void)
 // {
 // 	t_map *map;
@@ -183,13 +184,12 @@ static int parse_args(int argc, char **argv, t_map *map)
 		perror("Error reading map file");
 		return (FAILURE);
 	}
-	if (parse_file(buffer, map) == FAILURE)
+	if (!parse_file(buffer, map))
 	{
 		ft_putstr_fd("Error parsing map file\n", 2);
 		free(buffer);
 		return (FAILURE);
 	}
-	print_map(map);
 	free(buffer);
 	return (SUCCESS);
 }
@@ -210,9 +210,13 @@ int	map_create(t_game **game, int argc, char **argv)
 	parse_args(argc, argv, map);
 	print_map(map);
 	if(!enclosed_map(map))
+	{
 		fprintf(stderr, "NOT GOOD MAP FRIEND\n");
-	else
-		fprintf(stderr, "YES, GOOD MAP FRIEND\n");
+		map_free(map);
+		return (FAILURE);
+	}
+	print_config(map);
+
 	(*game)->map = map;
 	return (SUCCESS);
 }