diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/server/maphand.c freeciv/server/maphand.c
--- FreecivCVS/server/maphand.c	Wed May 10 16:38:08 2000
+++ freeciv/server/maphand.c	Thu May 11 13:46:48 2000
@@ -294,9 +294,12 @@
 	freelog (LOG_DEBUG, "Fogging %i,%i. Previous fog: %i.",
 		 x,y,ptile->seen[pplayer->player_no]);
 	ptile->seen[pplayer->player_no]--;
-	if (ptile->seen[pplayer->player_no] > 60000)
-	  freelog(LOG_FATAL, "square %i,%i has a seen value > 60000 (wrap) for player %s",
-		  abs_x, abs_y, pplayer->name);     
+	if (ptile->seen[pplayer->player_no] > 60000) {
+	  freelog(LOG_FATAL,
+		  "Square %i,%i has a seen value > 60000 (wrap) for player %s.",
+		  abs_x, abs_y, pplayer->name);
+	  exit(1);
+	}
 	if (ptile->seen[pplayer->player_no] == 0) {
 	  update_player_tile_last_seen(pplayer,abs_x,abs_y);
 	  send_tile_info(pplayer, abs_x, abs_y);
@@ -478,8 +481,8 @@
   }
 
   if (i < MAX_NUM_PLAYERS) {
-    freelog(LOG_FATAL, _("Too few starts %d (need at least %d)."
-			 " Filling out with 0,0 start positions."),
+    freelog(LOG_NORMAL, _("Too few starts %d (need at least %d)."
+			  " Filling out with 0,0 start positions."),
 	    i, MAX_NUM_PLAYERS);
   }
 
@@ -1006,11 +1009,11 @@
 ***************************************************************/
 struct player_tile *map_get_player_tile(struct player *pplayer,int x, int y)
 {
-  if(y<0 || y>=map.ysize) {
-    freelog(LOG_FATAL, "Trying to get nonexistant tile at %i,%i", x,y);
-    return player_tiles[pplayer->player_no]+map_adjust_x(x)+map_adjust_y(y)*map.xsize;
-  } else
-    return player_tiles[pplayer->player_no]+map_adjust_x(x)+y*map.xsize;
+  if (y<0 || y>=map.ysize) {
+    freelog(LOG_FATAL, "Trying to get nonexistant tile at %i,%i.", x,y);
+    exit(1);
+  }
+  return player_tiles[pplayer->player_no]+map_adjust_x(x)+y*map.xsize;
 }
 
 /***************************************************************
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/server/unithand.c freeciv/server/unithand.c
--- FreecivCVS/server/unithand.c	Thu May 11 11:01:42 2000
+++ freeciv/server/unithand.c	Thu May 11 13:44:07 2000
@@ -837,12 +837,14 @@
     send_unit_info(unit_owner(punit), punit);
 
     /* if is_diplomat_action_available() then there must be a city or a unit */
-    if ((pcity = map_get_city(dest_x,dest_y)))
+    if ((pcity = map_get_city(dest_x,dest_y))) {
       packet.target_id = pcity->id;
-    else if (pdefender)
+    } else if (pdefender) {
       packet.target_id = pdefender->id;
-    else
-      freelog(LOG_FATAL, "Bug in unithand.c");
+    } else {
+      freelog(LOG_FATAL, "Bug in unithand.c: no diplomat target.");
+      exit(1);
+    }
     packet.diplomat_id = punit->id;
     packet.action_type = DIPLOMAT_CLIENT_POPUP_DIALOG;
     send_packet_diplomat_action(unit_owner(punit)->conn, &packet);