diff --git a/src/Engine/Network/Packet.cpp b/src/Engine/Network/Packet.cpp
index 74afd656..6a4d0098 100644
--- a/src/Engine/Network/Packet.cpp
+++ b/src/Engine/Network/Packet.cpp
@@ -54,8 +54,10 @@ void Packet::WriteString(const std::string& str)
         }
         resizeData();
     }
-    memcpy(m_Data + m_Offset, str.data(), sizeOfString * sizeof(char));
-    m_Offset += sizeOfString * sizeof(char);
+    memcpy(m_Data + m_Offset, str.data(), str.size() * sizeof(char));
+    m_Offset += str.size() * sizeof(char);
+    m_Data[m_Offset] = '\0';
+    m_Offset += 1;
 }
 
 void Packet::WriteData(char * data, int sizeOfData)
diff --git a/src/Engine/Network/TCPClient.cpp b/src/Engine/Network/TCPClient.cpp
index f3394d3d..8bfa9ded 100644
--- a/src/Engine/Network/TCPClient.cpp
+++ b/src/Engine/Network/TCPClient.cpp
@@ -74,7 +74,10 @@ size_t TCPClient::readBuffer()
         boost::asio::ip::tcp::socket::message_peek, error);
     unsigned int sizeOfPacket = 0;
     memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
-
+    if (sizeOfPacket > m_Socket->available()) {
+        LOG_WARNING("TCPClient::readBuffer(): We haven't got the whole packet yet.");
+        return 0;
+    }
     // if the buffer is to small increase the size of it
     // TODO if message is huge 1 time the buffer will not decrease.
     if (sizeOfPacket > m_BufferSize) {
diff --git a/src/Engine/Network/TCPServer.cpp b/src/Engine/Network/TCPServer.cpp
index acd3d6d0..ff35aa91 100644
--- a/src/Engine/Network/TCPServer.cpp
+++ b/src/Engine/Network/TCPServer.cpp
@@ -106,7 +106,10 @@ int TCPServer::readBuffer(PlayerDefinition & playerDefinition)
         boost::asio::ip::tcp::socket::message_peek, error);
     unsigned int sizeOfPacket = 0;
     memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
-
+    if (sizeOfPacket > playerDefinition.TCPSocket->available()) {
+        LOG_WARNING("TCPServer::readBuffer(): We haven't got the whole packet yet.");
+        return 0;
+    }
     // if the buffer is to small increase the size of it
     if (sizeOfPacket > m_BufferSize) {
         delete[] m_ReadBuffer;
diff --git a/src/Engine/Network/UDPClient.cpp b/src/Engine/Network/UDPClient.cpp
index 51c29920..a7061884 100644
--- a/src/Engine/Network/UDPClient.cpp
+++ b/src/Engine/Network/UDPClient.cpp
@@ -45,7 +45,10 @@ int UDPClient::readBuffer()
          boost::asio::ip::udp::socket::message_peek, error);
     int sizeOfPacket = 0;
     memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
-
+    if (sizeOfPacket > m_Socket->available()) {
+        LOG_WARNING("UDPClient::readBuffer(): We haven't got the whole packet yet.");
+        return 0;
+    }
     // if the buffer is to small increase the size of it
     if (sizeOfPacket > m_BufferSize) {
         delete[] m_ReadBuffer;
diff --git a/src/Engine/Network/UDPServer.cpp b/src/Engine/Network/UDPServer.cpp
index 635ebd4d..13dd5ccd 100644
--- a/src/Engine/Network/UDPServer.cpp
+++ b/src/Engine/Network/UDPServer.cpp
@@ -92,6 +92,11 @@ int UDPServer::readBuffer()
     unsigned int sizeOfPacket = 0;
     memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
 
+    if (sizeOfPacket > m_Socket->available()) {
+        LOG_WARNING("UDPServer::readBuffer(): We haven't got the whole packet yet.");
+        return 0;
+    }
+
     // if the buffer is to small increase the size of it
     if (sizeOfPacket > m_BufferSize) {
         delete[] m_ReadBuffer;