diff --git a/src/i_net.cpp b/src/i_net.cpp
index 6fdcb52ba..188d2871e 100644
--- a/src/i_net.cpp
+++ b/src/i_net.cpp
@@ -135,8 +135,8 @@ struct PreGamePacket
 	};
 	struct
 	{
-		u_long	address;
-		u_short	port;
+		DWORD	address;
+		WORD	port;
 		BYTE	player;
 		BYTE	pad;
 	} machines[MAXNETNODES];
@@ -660,6 +660,12 @@ void HostGame (int i)
 		numplayers = 2;
 	}
 
+	if (numplayers > MAXNETNODES)
+	{
+		I_FatalError("You cannot host a game with %d players. The limit is currently %d.", numplayers, MAXNETNODES);
+		return;
+	}
+
 	if (numplayers == 1)
 	{ // Special case: Only 1 player, so don't bother starting the network
 		netgame = false;