diff --git a/.gitignore b/.gitignore
index fb54edd441..288dfbcbdf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,7 +47,7 @@ build.ninja
 /Testing
 
 # Custom user scripts
-*.sh
+/*.sh
 
 # Build directories
 /build*
diff --git a/server/citytools.cpp b/server/citytools.cpp
index c52a2eedc3..aba5ffbb49 100644
--- a/server/citytools.cpp
+++ b/server/citytools.cpp
@@ -759,7 +759,11 @@ void transfer_city_units(struct player *pplayer, struct player *pvictim,
         unit_list_remove(units, vunit);
       } else if (!pplayers_allied(pplayer, unit_owner(vunit))) {
         // the owner of vunit is allied to pvictim but not to pplayer
-        bounce_unit(vunit);
+        if (verbose) {
+          bounce_unit(vunit);
+        } else {
+          bounce_unit_silently(vunit);
+        }
       }
     }
     unit_list_iterate_safe_end;
diff --git a/server/maphand.cpp b/server/maphand.cpp
index 79d818e52d..2b9502c485 100644
--- a/server/maphand.cpp
+++ b/server/maphand.cpp
@@ -1796,7 +1796,7 @@ static void check_units_single_tile(struct tile *ptile)
                           _("Moved your %s due to changing terrain."),
                           unit_link(bevent.bunit));
           },
-          [](struct bounce_event bevent) -> void {
+          [](struct bounce_disband_event bevent) -> void {
             notify_player(unit_owner(bevent.bunit), unit_tile(bevent.bunit),
                           E_UNIT_LOST_MISC, ftc_server,
                           _("Disbanded your %s due to changing terrain."),
diff --git a/server/unittools.cpp b/server/unittools.cpp
index 1f6d77dbe6..41b9063f11 100644
--- a/server/unittools.cpp
+++ b/server/unittools.cpp
@@ -1331,18 +1331,22 @@ bool bounce_path_constraint::is_allowed(
  * See `bounce_unit_silently` to attempt a bounce without reporting it to the
  * unit's owner.
  *
- * Note: The unit may have died even if the bounce was successful.
- * Note: If a transport fails to bounce, all units in the transport will be
+ * \note
+ * The unit may have died even if the bounce was successful.
+ *
+ * \note
+ * If a transport fails to bounce, all units in the transport will be
  * bounced, triggering on_success or on_fail for each.
  */
 void bounce_unit(struct unit *punit, int max_distance,
                  std::function<void(struct bounce_event)> on_success,
-                 std::function<void(struct bounce_event)> on_failure)
+                 std::function<void(struct bounce_disband_event)> on_failure)
 {
   if (!punit) {
     return;
   }
 
+  const int unit_id = punit->id;
   const auto pplayer = unit_owner(punit);
   const auto punit_tile = unit_tile(punit);
 
@@ -1394,7 +1398,7 @@ void bounce_unit(struct unit *punit, int max_distance,
 
       handle_unit_orders(pplayer, &packet);
 
-      if (!punit) {
+      if (!unit_exists(unit_id)) {
         return; // Unit died while executing orders
       }
 
@@ -1413,25 +1417,35 @@ void bounce_unit(struct unit *punit, int max_distance,
    * Try to bounce transported units. */
   if (0 < get_transporter_occupancy(punit)) {
     const auto pcargo_units = unit_transport_cargo(punit);
-    unit_list_iterate(pcargo_units, pcargo)
+    unit_list_iterate_safe(pcargo_units, pcargo)
     {
       bounce_unit(pcargo, max_distance, on_success, on_failure);
     }
-    unit_list_iterate_end;
+    unit_list_iterate_safe_end;
   }
 
   if (on_failure) {
-    on_failure({.bunit = punit, .to_tile = nullptr});
+    on_failure({.bunit = punit});
   }
 
   wipe_unit(punit, ULR_STACK_CONFLICT, nullptr);
 }
 
+/**
+ * Move or remove a unit due to stack conflicts. This does not report the
+ * move to the unit owner.
+ *
+ * See: `bounce_unit`
+ */
 void bounce_unit_silently(struct unit *punit, int max_distance)
 {
   bounce_unit(punit, max_distance, nullptr, nullptr);
 }
 
+/**
+ * Reports that a unit was bounced due to stack conflicts to the unit's
+ * owner.
+ */
 void report_unit_bounced_to_resolve_stack_conflicts(
     struct bounce_event bevent)
 {
@@ -1441,8 +1455,12 @@ void report_unit_bounced_to_resolve_stack_conflicts(
                 _("Moved your %s."), unit_link(bevent.bunit));
 }
 
+/**
+ * Reports that a unit was disbanded due to stack conflicts to the unit's
+ * owner.
+ */
 void report_unit_disbanded_to_resolve_stack_conflicts(
-    struct bounce_event bevent)
+    struct bounce_disband_event bevent)
 {
   notify_player(unit_owner(bevent.bunit), unit_tile(bevent.bunit),
                 E_UNIT_LOST_MISC, ftc_server,
@@ -1450,6 +1468,11 @@ void report_unit_disbanded_to_resolve_stack_conflicts(
                 _("Disbanded your %s."), unit_tile_link(bevent.bunit));
 }
 
+/**
+ * Checks if a unit (still) exists.
+ */
+bool unit_exists(int unit_id) { return !!idex_lookup_unit(&wld, unit_id); }
+
 /**
    Throw pplayer's units from non allied cities
 
diff --git a/server/unittools.h b/server/unittools.h
index 8d45d52e59..8c80377d57 100644
--- a/server/unittools.h
+++ b/server/unittools.h
@@ -111,16 +111,21 @@ struct bounce_event {
   struct unit *bunit;
   struct tile *to_tile;
 };
+struct bounce_disband_event {
+  struct unit *bunit;
+};
 void report_unit_bounced_to_resolve_stack_conflicts(
     struct bounce_event bevent);
 void report_unit_disbanded_to_resolve_stack_conflicts(
-    struct bounce_event bevent);
-void bounce_unit(struct unit *punit, int max_distance = 2,
-                 std::function<void(struct bounce_event)> on_success =
-                     report_unit_bounced_to_resolve_stack_conflicts,
-                 std::function<void(struct bounce_event)> on_failure =
-                     report_unit_disbanded_to_resolve_stack_conflicts);
+    struct bounce_disband_event bevent);
+void bounce_unit(
+    struct unit *punit, int max_distance = 2,
+    std::function<void(struct bounce_event)> on_success =
+        report_unit_bounced_to_resolve_stack_conflicts,
+    std::function<void(struct bounce_disband_event)> on_failure =
+        report_unit_disbanded_to_resolve_stack_conflicts);
 void bounce_unit_silently(struct unit *punit, int max_distance = 2);
+bool unit_exists(int unit_id);
 
 bool unit_activity_needs_target_from_client(enum unit_activity activity);
 void unit_assign_specific_activity_target(struct unit *punit,