diff --git a/Download/12.text b/Download/12.text
deleted file mode 100644
index 45ba044..0000000
Binary files a/Download/12.text and /dev/null differ
diff --git a/Download/13.text b/Download/13.text
deleted file mode 100644
index 36bfdb0..0000000
Binary files a/Download/13.text and /dev/null differ
diff --git a/Download/README b/Download/README
deleted file mode 100644
index a3fb69c..0000000
Binary files a/Download/README and /dev/null differ
diff --git a/client-network/src/message_handling.rs b/client-network/src/message_handling.rs
index 11842a2..f50c660 100644
--- a/client-network/src/message_handling.rs
+++ b/client-network/src/message_handling.rs
@@ -314,7 +314,7 @@ pub fn parse_message(
 
         ERROR => {
             if let Ok(err_received) =
-                String::from_utf8(received_message[LENGTH..(msg_length + LENGTH)].to_vec())
+                String::from_utf8(received_message[LENGTH..(msg_length + LENGTH + 4)].to_vec())
             {
                 let err_msg = format!("Error received from peer {} : {}", ip, err_received);
                 let _ = cmd_tx_clone.send(NetworkEvent::Error(err_msg));
diff --git a/client-network/src/registration.rs b/client-network/src/registration.rs
index 8d83ba5..608a054 100644
--- a/client-network/src/registration.rs
+++ b/client-network/src/registration.rs
@@ -66,7 +66,6 @@ pub async fn perform_handshake(
     match server_addr_query.await {
         Some(sockaddr_bytes) => {
             sd.set_servername(username);
-            sd.set_serveraddress(sockaddr_bytes.to_string());
             // first: &SocketAddr
             let mut payload = Vec::new();
             payload.extend_from_slice(&0u32.to_be_bytes());
@@ -74,6 +73,7 @@ pub async fn perform_handshake(
             let hello_handshake = construct_message(1, payload, id, crypto_pair);
             if is_server_handshake {
                 sd.add_message(id, EventType::Hello);
+                sd.set_serveraddress(sockaddr_bytes.to_string());
             } else {
                 sd.add_message(id, EventType::HelloThenRootRequest);
             }