diff --git a/ChangeLog b/ChangeLog
index 3521d17..832557c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-$Id: ChangeLog,v 1.59 2004/02/01 00:26:21 stpohle Exp $
+$Id: ChangeLog,v 1.60 2004/02/01 00:44:16 stpohle Exp $
 
 - Added: Deathmatch mode.
 
@@ -36,6 +36,9 @@ $Id: ChangeLog,v 1.59 2004/02/01 00:26:21 stpohle Exp $
 
 - Fixed: Networking over IPv6 had a little network init problem
 
+- Fixed: Crash on Hosting games with OGC enabled and no internet
+  connection
+
 
 Version 0.11.0
 ==============
diff --git a/src/netmenu.c b/src/netmenu.c
index c338155..bbff23b 100644
--- a/src/netmenu.c
+++ b/src/netmenu.c
@@ -65,7 +65,9 @@ network_options ()
 		menu_create_list ("Players", 270, 55, 55, 70, nrplayerlist, &selnrplayer, 1);
 		menu_create_entry ("Gamename", -1, 150, 300, &bman.gamename, LEN_GAMENAME, MENU_entrytext, 2);
 		menu_create_entry ("UDP Port:", -1, 180, 200, &bman.port, LEN_PORT, MENU_entrytext,3); 
+#ifndef _WIN32
 		menu_create_bool ("IPV6", 50, 215, 100, &net_ai_typ, 4);
+#endif
 		menu_create_bool ("Firewall", 270, 215, 100, &bman.firewall, 5);
 		menu_create_bool ("Use OpenGameCache", -1, 250, 350, &bman.notifygamemaster, 6);
 		menu_create_entry ("OpenGameCache:", -1, 280, 350, &bman.ogcserver, LEN_SERVERNAME, MENU_entrytext, 7);
diff --git a/src/ogcache-client.c b/src/ogcache-client.c
index 27d7b1c..f1914a2 100644
--- a/src/ogcache-client.c
+++ b/src/ogcache-client.c
@@ -1,4 +1,4 @@
-/* $Id: ogcache-client.c,v 1.5 2004/02/01 00:39:26 stpohle Exp $
+/* $Id: ogcache-client.c,v 1.6 2004/02/01 00:41:00 stpohle Exp $
  * OpenGameCache-Client: this file will hold the protocol for the gameserver communication
  */
 
@@ -178,8 +178,11 @@ int ogc_init (char *localport, char *server, char *port, char *game, int ai_fami
 	ogc_ai_family = ai_family;
 	
 	d_printf ("ogc_host:%s ogc_port:%s ogc_game:%s ogc_ai_family:%d\n", ogc_host, ogc_port, ogc_game, ogc_ai_family);
-	if (dns_filladdr (ogc_host, LEN_OGCHOST, ogc_port, LEN_OGCPORT, ogc_ai_family, &ogc_addr) < 0)
+	if (dns_filladdr (ogc_host, LEN_OGCHOST, ogc_port, LEN_OGCPORT, ogc_ai_family, &ogc_addr) < 0) {
+		udp_close (ogc_sock);
+		ogc_sock = -1;
 		return 0;
+	}
 	
 	for (i = 0; i < MAX_OGC_ENTRYS; i++)
 		ogc_array[i].serial = -1;