diff --git a/src/main.rs b/src/main.rs
index ac066fe..618042a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,16 +1,18 @@
 use std::io::Read;
 use std::net::{TcpListener, TcpStream};
 
-fn main() {
-    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+fn main() -> std::io::Result<()> {
+    let listener = TcpListener::bind("127.0.0.1:7878")?;
     for stream in listener.incoming() {
-        let stream = stream.unwrap();
+        let stream = stream?;
         handle_connection(stream);
     }
+    Ok(())
 }
 
-fn handle_connection(mut stream: TcpStream) {
+fn handle_connection(mut stream: TcpStream) -> std::io::Result<()>{
     let mut buffer = [0; 1024];
-    stream.read(&mut buffer).unwrap();
+    stream.read(&mut buffer)?;
     println!("Request: {}", String::from_utf8_lossy(&buffer[..]));
+    Ok(())
 }