diff --git a/modules/modes/feebas.py b/modules/modes/feebas.py
index abe6a719..e2ca48d0 100644
--- a/modules/modes/feebas.py
+++ b/modules/modes/feebas.py
@@ -23,6 +23,7 @@
 from ..encounter import EncounterInfo
 from ..memory import get_event_flag
 
+
 # How many times the bot tries to fish on the same tile before it deems it
 # a non-Feebas tile and moves on.
 maximum_number_of_fishing_attempts_per_tile = 3
@@ -177,7 +178,7 @@ def run(self) -> Generator:
         if get_event_flag("BADGE08_GET"):
             for pokemon in get_party():
                 for learned_move in pokemon.moves:
-                    if learned_move.move.name == "Waterfall":
+                    if learned_move is not None and learned_move.move.name == "Waterfall":
                         self._can_use_waterfall = True
                         break