diff --git a/includes/Bot.hpp b/includes/Bot.hpp
index 7c6dc02..456a6bc 100644
--- a/includes/Bot.hpp
+++ b/includes/Bot.hpp
@@ -6,7 +6,7 @@
 /*   By: vvaas <vvaas@student.42angouleme.fr>       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/01/30 01:54:36 by vvaas             #+#    #+#             */
-/*   Updated: 2024/01/30 18:13:55 by vvaas            ###   ########.fr       */
+/*   Updated: 2024/01/30 21:38:16 by vvaas            ###   ########.fr       */
 /*                                                                            */
 /******************************************************************************/
 
@@ -22,7 +22,7 @@ class Bot
 {
 	public:
 		Bot();
-		void init(void);
+		bool init(void);
 		void connect_to_server(void);
 		void handle_response(std::string buffer);
 		void send_message(const std::string &content);
diff --git a/srcs_bonus/bot.cpp b/srcs_bonus/bot.cpp
index bcace13..d284cd7 100644
--- a/srcs_bonus/bot.cpp
+++ b/srcs_bonus/bot.cpp
@@ -6,7 +6,7 @@
 /*   By: vvaas <vvaas@student.42angouleme.fr>       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/01/30 01:54:56 by vvaas             #+#    #+#             */
-/*   Updated: 2024/01/30 18:52:24 by maldavid         ###   ########.fr       */
+/*   Updated: 2024/01/30 21:45:18 by vvaas            ###   ########.fr       */
 /*                                                                            */
 /******************************************************************************/
 
@@ -18,8 +18,11 @@
 #include <fcntl.h>
 #include <cstring>
 #include <cstdlib>
+#include <signal.h>
 
-Bot::Bot() : _channel_created(false), _logged(false)
+bool active = true;
+
+Bot::Bot() : _channel_created(false), _logged(false), _fd(-1)
 {}
 
 Bot::~Bot()
@@ -28,7 +31,15 @@ Bot::~Bot()
 		close(_fd);
 }
 
-void Bot::init()
+void signalsHandler(int foo)
+{
+	(void)foo;
+	std::cout << "\b\b  \b\b" << std::flush;
+	irc::logs::report(irc::log_message, "Shutting down...");
+	active = false;
+}
+
+bool Bot::init()
 {
 	_connect_commands.push_back("PASS " PASSWORD "\r\n");
 	_connect_commands.push_back("NICK greg\r\n");
@@ -41,9 +52,18 @@ void Bot::init()
     _serv_addr.sin_port = htons(PORT);
 	_serv_addr.sin_addr.s_addr = inet_addr(IP);
 	if(connect(_fd, (struct sockaddr*)&_serv_addr, sizeof(_serv_addr)) < 0)
-        irc::logs::report(irc::log_fatal_error, "connect error");
+	{
+        irc::logs::report(irc::log_error, "connect error");
+		return (false);
+	}
 	if(fcntl(_fd, F_SETFL, O_NONBLOCK) < 0)
-		irc::logs::report(irc::log_fatal_error, "fcntl() error");
+	{
+        irc::logs::report(irc::log_error, "fcntl error");
+		return (false);
+	}
+	signal(SIGINT, signalsHandler);
+	signal(SIGQUIT, signalsHandler);
+	return (true);
 }
 
 void Bot::send_message(const std::string &content)
@@ -89,7 +109,7 @@ void Bot::connect_to_server()
 		if(recv(_fd, buffer, 1024, 0) > 0)
 			handle_response(buffer);
 	} 
-	while (true)
+	while (active)
 	{
 		if(recv(_fd, buffer, 1024, 0) > 0)
 			handle_response(buffer);
diff --git a/srcs_bonus/main.cpp b/srcs_bonus/main.cpp
index 0d217e9..371f34d 100644
--- a/srcs_bonus/main.cpp
+++ b/srcs_bonus/main.cpp
@@ -6,7 +6,7 @@
 /*   By: vvaas <vvaas@student.42angouleme.fr>       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/01/29 20:36:23 by vvaas             #+#    #+#             */
-/*   Updated: 2024/01/30 18:48:49 by vvaas            ###   ########.fr       */
+/*   Updated: 2024/01/30 21:39:43 by vvaas            ###   ########.fr       */
 /*                                                                            */
 /******************************************************************************/
 
@@ -16,7 +16,8 @@ int main()
 {
 	Bot greg;
 
-	greg.init();
+	if (!greg.init())
+		return 1;
 	greg.connect_to_server();
 	return 0;
 }