diff --git a/module/os/map.py b/module/os/map.py
index 6460010bb..b51aac266 100644
--- a/module/os/map.py
+++ b/module/os/map.py
@@ -549,6 +549,7 @@ class OSMap(OSFleet, Map, GlobeCamera, StrategicSearchHandler):
             if self.info_bar_count()==1:
                 self.ensure_no_info_bar()
                 self.device.sleep(5)
+                self.device.screenshot()
                 for __ in self.loop():
                     if self.appear_then_click(AUTO_SEARCH_OS_MAP_OPTION_ON, offset=(5, 120)):
                         break
@@ -559,6 +560,8 @@ class OSMap(OSFleet, Map, GlobeCamera, StrategicSearchHandler):
                         continue
                     if self.appear_then_click(AUTO_SEARCH_REWARD, offset=(5, 120)):
                         break
+                    if self.handle_retirement():
+                        break
             if self.handle_battle_status():
                 self.combat_status(expected_end='no_searching')
             if self.handle_map_event():