diff --git a/ChangeLog b/ChangeLog
index 757af9c..03674d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-$Id: ChangeLog,v 1.77 2004/09/12 20:54:24 stpohle Exp $
+$Id: ChangeLog,v 1.78 2004/09/12 21:08:11 stpohle Exp $
 
 * NEED TO FIX: Server starts the game soo fast that the
   client's ignore the gamestat for a running game.
@@ -6,7 +6,7 @@ $Id: ChangeLog,v 1.77 2004/09/12 20:54:24 stpohle Exp $
 
 * FINISH TEAM MODE.
 
-* NEED TO FIX: Network Version Error. There is no 
+- fixed: Network Version Error. There is no 
   possible Escape.
 
 - fixed: Single Player Menu there was no ESC key working
diff --git a/src/multiwait.c b/src/multiwait.c
index b72c5cd..7bc43ef 100644
--- a/src/multiwait.c
+++ b/src/multiwait.c
@@ -1,4 +1,4 @@
-/* $Id: multiwait.c,v 1.42 2004/05/25 22:22:29 stpohle Exp $
+/* $Id: multiwait.c,v 1.43 2004/09/12 21:08:11 stpohle Exp $
    multiwait.c - this manages only the network screen where
    everyone have to select it's players and where even the basic chat is inside
 */
@@ -249,7 +249,7 @@ void wait_for_players () {
 		chat.active = 1;
 		
 		s_calctimesync ();
-	} while (bman.state == GS_wait);
+	} while (bman.state == GS_wait && bman.sock != -1);
 
     mw_shutdown ();
 };
diff --git a/src/netmenu.c b/src/netmenu.c
index 1534417..9afcc00 100644
--- a/src/netmenu.c
+++ b/src/netmenu.c
@@ -161,7 +161,7 @@ void host_multiplayer_game () {
 /* the loop for the multiplayer games */
 void multiplayer_game () {
 	
-    while (bman.state != GS_startup && bman.state != GS_quit) {
+    while (bman.state != GS_startup && bman.state != GS_quit && bman.sock != -1) {
         /* check players and in_pl lists */
         wait_for_players ();
 
diff --git a/src/packets.c b/src/packets.c
index c2218d7..097e320 100644
--- a/src/packets.c
+++ b/src/packets.c
@@ -65,6 +65,8 @@ do_error (struct pkg_error *data, _net_addr * addr)
 {
     d_printf ("Network Error from %s:%s : '%s'\n", addr->host, addr->port, data->text);
 	
+	network_shutdown ();
+	
     menu_displaymessage ("Network Error", "Got Error from: %s:%s\nMessage:%s", addr->host, addr->port, data->text);
     if (data->nr == 1)
         return -1;