diff --git a/server/generator/mapgen.c b/server/generator/mapgen.c
index 54b95f4ed..a42dc73b9 100644
--- a/server/generator/mapgen.c
+++ b/server/generator/mapgen.c
@@ -3085,7 +3085,7 @@ static struct fair_tile *fair_map_island_new(int size, int startpos_num)
   fantasy = (size * 2) / 5;
   pisland = fair_map_new();
   pftile = fair_map_pos_tile(pisland, wld.map.xsize / 2, wld.map.ysize / 2);
-  fc_assert(!fair_map_tile_border(pisland, pftile, sea_around_island));
+  fc_assert_exit(!fair_map_tile_border(pisland, pftile, sea_around_island));
   pftile->flags |= FTF_ASSIGNED;
   land_tiles[0] = pftile;
   i = 1;
@@ -3099,7 +3099,7 @@ static struct fair_tile *fair_map_island_new(int size, int startpos_num)
 
     for (j = 0; j < wld.map.num_valid_dirs; j++) {
       pftile2 = fair_map_tile_step(pisland, pftile, wld.map.valid_dirs[j]);
-      fc_assert(pftile2 != NULL);
+      fc_assert_exit(pftile2 != NULL);
       if (fair_map_tile_border(pisland, pftile2, sea_around_island)) {
         continue;
       }