Index: code/q3_ui/ui_servers2.c
===================================================================
--- code/q3_ui/ui_servers2.c	(revision 1788)
+++ code/q3_ui/ui_servers2.c	(working copy)
@@ -147,11 +147,12 @@
 };
 
 static char* netnames[] = {
-	"???",
-	"UDP",
+	"??? ",
+	"UDP ",
 	"UDP6",
 	NULL
 };
+static const int numNetnames = sizeof(netnames) / sizeof(char*) - 1;
 
 static char quake3worldMessage[] = "Visit www.quake3world.com - News, Community, Events, Files";
 
@@ -534,7 +535,7 @@
 			pingColor = S_COLOR_RED;
 		}
 
-		Com_sprintf( buff, MAX_LISTBOXWIDTH, "%-20.20s %-12.12s %2d/%2d %-8.8s %3s %s%3d " S_COLOR_YELLOW "%s", 
+		Com_sprintf( buff, MAX_LISTBOXWIDTH, "%-20.20s %-12.12s %2d/%2d %-8.8s %4s%s%3d " S_COLOR_YELLOW "%s", 
 			servernodeptr->hostname, servernodeptr->mapname, servernodeptr->numclients,
  			servernodeptr->maxclients, servernodeptr->gamename,
 			netnames[servernodeptr->nettype], pingColor, servernodeptr->pingtime, servernodeptr->bPB ? "Yes" : "No" );
@@ -672,6 +673,9 @@
 	}
 	*/
 	servernodeptr->nettype = atoi(Info_ValueForKey(info, "nettype"));
+	if (servernodeptr->nettype < 0 || servernodeptr->nettype >= numNetnames) {
+		servernodeptr->nettype = 0;
+	}
 
 	s = Info_ValueForKey( info, "game");
 	i = atoi( Info_ValueForKey( info, "gametype") );