diff --git a/includes/requests/HttpIMessage.hpp b/includes/requests/HttpIMessage.hpp
index eb63d3e..60511ee 100644
--- a/includes/requests/HttpIMessage.hpp
+++ b/includes/requests/HttpIMessage.hpp
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/11 22:13:38 by mmoussou          #+#    #+#             */
-/*   Updated: 2025/04/22 15:00:18 by adjoly           ###   ########.fr       */
+/*   Updated: 2025/04/23 14:38:55 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -23,6 +23,8 @@ public:
 	virtual std::map<std::string, std::string>	getHeaders(void) const;
 	virtual std::string								getBody(void) const;
 
+	virtual	~IMessage() {}
+
 	virtual void	setHeaders(std::map<std::string, std::string> const headers);
 	virtual void	setBody(std::string const body);
 
diff --git a/includes/requests/HttpResponse.hpp b/includes/requests/HttpResponse.hpp
index cf44d32..8ac7e33 100644
--- a/includes/requests/HttpResponse.hpp
+++ b/includes/requests/HttpResponse.hpp
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/03 17:21:20 by mmoussou          #+#    #+#             */
-/*   Updated: 2025/04/22 11:52:22 by mmoussou         ###   ########.fr       */
+/*   Updated: 2025/04/23 14:36:47 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -24,7 +24,7 @@ namespace http {
 class Response: public http::IMessage {
 public:
 	Response(void);
-	virtual ~Response(void);
+	~Response(void);
 
 	std::string	getProtocol(void) const;
 	uint		getStatusCode(void) const;
diff --git a/includes/server/Client.hpp b/includes/server/Client.hpp
index 2d660ff..4d1ca6f 100644
--- a/includes/server/Client.hpp
+++ b/includes/server/Client.hpp
@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/04/14 14:14:39 by adjoly            #+#    #+#             */
-/*   Updated: 2025/04/22 14:23:44 by adjoly           ###   ########.fr       */
+/*   Updated: 2025/04/23 14:39:16 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -34,7 +34,7 @@ class Client {
 	int				   _fd;
 	struct sockaddr_in _client_addr;
 	http::IRequest	  *_request;
-	http::Response	  *_response;
+	//http::Response	  *_response;
 	config::Server	  *_conf;
 };
 
diff --git a/src/requests_handling/HttpResponse.cpp b/src/requests_handling/HttpResponse.cpp
index e7549ff..c38e4ec 100644
--- a/src/requests_handling/HttpResponse.cpp
+++ b/src/requests_handling/HttpResponse.cpp
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/03 17:28:31 by mmoussou          #+#    #+#             */
-/*   Updated: 2025/04/20 11:21:11 by mmoussou         ###   ########.fr       */
+/*   Updated: 2025/04/23 14:30:28 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/src/server/Client.cpp b/src/server/Client.cpp
index 7216e11..cf1b71b 100644
--- a/src/server/Client.cpp
+++ b/src/server/Client.cpp
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/04/17 11:12:41 by mmoussou          #+#    #+#             */
-/*   Updated: 2025/04/23 12:42:41 by adjoly           ###   ########.fr       */
+/*   Updated: 2025/04/23 14:40:06 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -25,7 +25,7 @@ Client::Client(int fd, sockaddr_in socket, config::Config *conf)
 		bytes_received = recv(fd, buffer, BUFFER_SIZE - 1, 0);
 		if (bytes_received == -1) {
 			_log->error("failed to receive request");
-			continue;
+			throw std::runtime_error("failed to receive request");
 		}
 		received_data += std::string(buffer, bytes_received);
 	} while (buffer[bytes_received]);
@@ -59,21 +59,18 @@ void Client::_getRequest(std::string request_str) {
 }
 
 void Client::answer(void) {
+	(void) _client_addr;
 	std::string response;
-	(void)_client_addr;
 
 	if (this->_request->getMethod() == "GET" ||
 		this->_request->getMethod() == "DELETE" ||
 		this->_request->getMethod() == "POST")
 		response = this->_request->execute().str();
 	else
-		response = "HTTP/1.1 501 Not Implemented\r\nContent-Type: "
-				   "text/html\r\n\r\n<html><body><h1>501 Not "
-				   "Implemented</h1></body></html>";
+		response = "HTTP/1.1 501 Not Implemented\r\nContent-Type: text/html\r\n\r\n<html><body><h1>501 Not Implemented</h1></body></html>";
 	send(this->_fd, response.c_str(), response.length(), 0);
 }
 
 Client::~Client(void) {
 	delete (http::Get *)(this->_request);
-	delete this->_response;
 }