diff --git a/rpcs3/Emu/NP/rpcn_client.cpp b/rpcs3/Emu/NP/rpcn_client.cpp
index d7bb274c66..38a4ad95ca 100644
--- a/rpcs3/Emu/NP/rpcn_client.cpp
+++ b/rpcs3/Emu/NP/rpcn_client.cpp
@@ -896,7 +896,7 @@ namespace rpcn
 					return error_and_disconnect("Failed to send all the bytes");
 				}
 
-				res = 0;
+				continue;
 			}
 			n_sent += res;
 		}
@@ -1055,6 +1055,8 @@ namespace rpcn
 				found = found->ai_next;
 			}
 
+			freeaddrinfo(addr_info);
+
 			if (!found_ipv4)
 			{
 				rpcn_log.error("connect: Failed to find IPv4 for %s", host);
@@ -1156,7 +1158,7 @@ namespace rpcn
 		if (!connected || terminate)
 		{
 			state = rpcn_state::failure_other;
-			return true;
+			return false;
 		}
 
 		if (received_version != RPCN_PROTOCOL_VERSION)
diff --git a/rpcs3/Emu/NP/rpcn_client.h b/rpcs3/Emu/NP/rpcn_client.h
index 56ba17d04d..377cd9c898 100644
--- a/rpcs3/Emu/NP/rpcn_client.h
+++ b/rpcs3/Emu/NP/rpcn_client.h
@@ -79,6 +79,14 @@ public:
 			res.push_back(vec[i]);
 			i++;
 		}
+
+		// Make sure we hit terminating 0
+		if (i >= vec.size())
+		{
+			error = true;
+			return {};
+		}
+
 		i++;
 
 		if (!empty && res.empty())