diff --git a/Makefile b/Makefile
index 6312acb..bf0747e 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ OBJ = ${SRC:.cpp=.o}
 
 CXX = c++
 
-CXXFLAGS = -std=c++98 #-fsanitize=address -g3 #-Wall -Wextra -Werror 
+CXXFLAGS = -std=c++98 -fsanitize=address -g3 #-Wall -Wextra -Werror 
 
 all : $(NAME)
 
diff --git a/Server.cpp b/Server.cpp
index 7cfa598..1736b9c 100644
--- a/Server.cpp
+++ b/Server.cpp
@@ -50,14 +50,14 @@ void Server::init() {
     signal(SIGQUIT, receiveSignal);
 
     createServerSocket();
-    std::cout << ">>> SERVER STARTED <<<" << std::endl;
-    std::cout << "Waiting for connections..." << std::endl;
+    std::cout << GREEN << ">>> SERVER STARTED <<<" << RESET << std::endl;
+    std::cout << CYAN <<"Waiting for connections..." << RESET << std::endl;
 }
 
 void Server::run() {
     while (!_signal) {
         int ret = poll(&_fds[0], _fds.size(), -1);
-        if (ret == -1)
+        if (ret == -1 && !_signal)
             throw std::runtime_error("Error: poll() failed");
 
         for (size_t i = 0; i < _fds.size(); ++i) {
diff --git a/Server.hpp b/Server.hpp
index 0c417f1..8e36c55 100644
--- a/Server.hpp
+++ b/Server.hpp
@@ -21,7 +21,13 @@
 #include <ctime>
 #include <iomanip>
 #define BUFFER_SIZE 1024
-
+#define RED "\033[31m"
+#define GREEN "\033[32m"
+#define YELLOW "\033[33m"
+#define BLUE "\033[34m"
+#define MAGENTA "\033[35m"
+#define CYAN "\033[36m"
+#define RESET "\033[0m"
 
 class Server {
     private:
diff --git a/main.cpp b/main.cpp
index 919e49a..af9a244 100644
--- a/main.cpp
+++ b/main.cpp
@@ -13,6 +13,6 @@ int main(int ac, char **av)
         std::cerr << e.what() << std::endl;
         return 1;
     }
-    std::cout << ">>> SERVER CLOSED <<<" << std::endl;
+    std::cout << RED << ">>> SERVER CLOSED <<<" << RED << std::endl;
     return 0;
 }