diff --git a/src/Components/Modules/Network.cpp b/src/Components/Modules/Network.cpp
index 14d46722..a3e32f1d 100644
--- a/src/Components/Modules/Network.cpp
+++ b/src/Components/Modules/Network.cpp
@@ -171,9 +171,14 @@ namespace Components
 	{
 		if (Network::PacketHandlers.find(Network::SelectedPacket) != Network::PacketHandlers.end())
 		{
+			std::string data;
+
 			size_t offset = Network::SelectedPacket.size() + 4 + 1;
 
-			std::string data(msg->data + offset, msg->cursize - offset);
+			if (static_cast<size_t>(msg->cursize) > offset)
+			{
+				data.append(msg->data + offset, msg->cursize - offset);
+			}
 
 			// Remove trailing 0x00 byte
 			if (data.size() && !data[data.size() - 1]) data.pop_back();
diff --git a/src/Components/Modules/Node.cpp b/src/Components/Modules/Node.cpp
index 204a4552..bc4f4c4e 100644
--- a/src/Components/Modules/Node.cpp
+++ b/src/Components/Modules/Node.cpp
@@ -44,11 +44,11 @@ namespace Components
 
 	void Node::AddNode(Network::Address address, bool valid)
 	{
-#ifdef DEBUG
+//#ifdef DEBUG
 		if (address.IsSelf()) return;
-#else
-		if (address.IsLocal() || address.IsSelf()) return;
-#endif
+// #else
+// 		if (address.IsLocal() || address.IsSelf()) return;
+// #endif
 
 		Node::NodeEntry entry;