diff --git a/evennia/contrib/game_systems/turnbattle/tb_basic.py b/evennia/contrib/game_systems/turnbattle/tb_basic.py
index 27c15372d7..240758e357 100644
--- a/evennia/contrib/game_systems/turnbattle/tb_basic.py
+++ b/evennia/contrib/game_systems/turnbattle/tb_basic.py
@@ -410,7 +410,9 @@ class TBBasicTurnHandler(DefaultScript):
         Called at script termination.
         """
         for fighter in self.db.fighters:
-            self.rules.combat_cleanup(fighter)  # Clean up the combat attributes for every fighter.
+            if fighter:
+                # Clean up the combat attributes for every fighter.
+                self.rules.combat_cleanup(fighter)
         self.obj.db.combat_turnhandler = None  # Remove reference to turn handler in location
 
     def at_repeat(self):