7 files changed, 7 insertions, 10 deletions

diff --git a/src/network/Network.hpp b/include/network/Network.hpp
index 1281289..1281289 100644
--- a/src/network/Network.hpp
+++ b/include/network/Network.hpp
diff --git a/src/network/NetworkClient.hpp b/include/network/NetworkClient.hpp
index 22b1b22..22b1b22 100644
--- a/src/network/NetworkClient.hpp
+++ b/include/network/NetworkClient.hpp
diff --git a/src/network/Packet.hpp b/include/network/Packet.hpp
index 685e3da..685e3da 100644
--- a/src/network/Packet.hpp
+++ b/include/network/Packet.hpp
diff --git a/src/network/Socket.hpp b/include/network/Socket.hpp
index 48bcad9..48bcad9 100644
--- a/src/network/Socket.hpp
+++ b/include/network/Socket.hpp
diff --git a/src/network/Stream.hpp b/include/network/Stream.hpp
index a24dfbe..a24dfbe 100644
--- a/src/network/Stream.hpp
+++ b/include/network/Stream.hpp
diff --git a/src/network/Network.cpp b/src/network/Network.cpp
index 798756d..91cb481 100644
--- a/src/network/Network.cpp
+++ b/src/network/Network.cpp
@@ -1,12 +1,8 @@
 #include <network/Network.hpp>
 
 Network::Network(std::string address, unsigned short port) {
-	try {
-		socket = new Socket(address, port);
-		stream = new StreamSocket(socket);
-	} catch (std::exception &e) {
-		LOG(FATAL)<<e.what();
-	}
+	socket = new Socket(address, port);
+	stream = new StreamSocket(socket);
 }
 
 Network::~Network() {
diff --git a/src/network/Stream.cpp b/src/network/Stream.cpp
index 2545b48..447b13f 100644
--- a/src/network/Stream.cpp
+++ b/src/network/Stream.cpp
@@ -30,10 +30,11 @@ short StreamInput::ReadShort() {
 }
 
 unsigned short StreamInput::ReadUShort() {
-	unsigned short value;
-	ReadData((unsigned char *) &value, 2);
-	endswap(value);
-	return value;
+	unsigned char buff[2];
+	ReadData(buff, 2);
+	unsigned short val = *(reinterpret_cast<unsigned short *>(buff));
+	endswap(val);
+	return val;
 }
 
 int StreamInput::ReadInt() {