diff --git a/Makefile b/Makefile
index afbb90d..f767677 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 #    By: qmennen <qmennen@student.codam.nl>           +#+                      #
 #                                                    +#+                       #
 #    Created: 2024/10/15 11:48:46 by whaffman      #+#    #+#                  #
-#    Updated: 2025/03/01 12:36:27 by whaffman      ########   odam.nl          #
+#    Updated: 2025/03/03 11:52:43 by whaffman      ########   odam.nl          #
 #                                                                              #
 # **************************************************************************** #
 
@@ -38,6 +38,8 @@ endif
 # Build configurations
 BUILD_CONFIGS = release debug asan tsan
 
+FLAGS = -DNOCOLORS -DNOBANNER -DNOPROMPT
+
 release_CFLAGS = -Wall -Werror -Werror -O2
 debug_CFLAGS = -Wall -Werror -Werror -g3 -DDEBUG -DDBG='fprintf(stderr, RED "DEBUG: " RESET "%s:%d (%s)\n", __FILE__, __LINE__, __PRETTY_FUNCTION__);'
 asan_CFLAGS = -Wall -Werror -Werror -fsanitize=address,leak,undefined -g3
diff --git a/src/environment/environment_add.c b/src/environment/environment_add.c
index 32049d0..96e7312 100644
--- a/src/environment/environment_add.c
+++ b/src/environment/environment_add.c
@@ -6,7 +6,7 @@
 /*   By: whaffman <whaffman@student.codam.nl>         +#+                     */
 /*                                                   +#+                      */
 /*   Created: 2025/02/04 16:13:33 by whaffman      #+#    #+#                 */
-/*   Updated: 2025/02/26 16:09:07 by whaffman      ########   odam.nl         */
+/*   Updated: 2025/03/03 12:00:19 by whaffman      ########   odam.nl         */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -22,18 +22,9 @@ void	environment_add(t_minishell *msh, char *name, char *value)
 	if (name != NULL && value != NULL)
 	{
 		new_environment = malloc_safe(msh, sizeof(t_environment));
-		if (new_environment == NULL)
-			return (perror("malloc"));
 		new_environment->name = ft_strdup_safe(msh, name);
 		new_environment->value = ft_strdup_safe(msh, value);
 		new_node = ft_lstnew_safe(msh, new_environment);
-		if (new_node == NULL
-			|| new_environment->name == NULL
-			|| new_environment->value == NULL)
-		{
-			environment_free(msh, new_environment);
-			return (perror("malloc"));
-		}
 		ft_lstadd_back(environment, new_node);
 	}
 }
diff --git a/src/utils/ft_free_arr_safe.c b/src/utils/ft_free_arr_safe.c
index bd58f29..8b1ad4f 100644
--- a/src/utils/ft_free_arr_safe.c
+++ b/src/utils/ft_free_arr_safe.c
@@ -6,7 +6,7 @@
 /*   By: whaffman <whaffman@student.codam.nl>         +#+                     */
 /*                                                   +#+                      */
 /*   Created: 2025/03/01 14:20:45 by whaffman      #+#    #+#                 */
-/*   Updated: 2025/03/02 22:09:58 by whaffman      ########   odam.nl         */
+/*   Updated: 2025/03/03 11:55:00 by whaffman      ########   odam.nl         */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -22,5 +22,6 @@ void	ft_free_arr_safe(t_minishell *msh, char **arr)
 		free_safe(msh, (void **)&arr[i]);
 		i++;
 	}
-	free_safe(msh, (void **)&arr);
+	if (arr != NULL)
+		free_safe(msh, (void **)&arr);
 }