diff --git a/Messages.py b/Messages.py
index 5e88a4757..44e579a10 100644
--- a/Messages.py
+++ b/Messages.py
@@ -1015,16 +1015,17 @@ def update_warp_song_text(messages, world):
         0x0892: 'Prelude of Light Warp -> Temple of Time',
     }
 
-    for id, entr in msg_list.items():
-        if 'warp_songs' in world.settings.misc_hints or not world.settings.warp_songs:
-            destination = world.get_entrance(entr).connected_region
-            destination_name = HintArea.at(destination)
-            color = COLOR_MAP[destination_name.color]
-            if destination_name.preposition(True) is not None:
-                destination_name = f'to {destination_name}'
-        else:
-            destination_name = 'to a mysterious place'
-            color = COLOR_MAP['White']
+    if world.settings.logic_rules != "glitched": # Entrances not set on glitched logic so following code will error
+        for id, entr in msg_list.items():
+            if 'warp_songs' in world.settings.misc_hints or not world.settings.warp_songs:
+                destination = world.get_entrance(entr).connected_region
+                destination_name = HintArea.at(destination)
+                color = COLOR_MAP[destination_name.color]
+                if destination_name.preposition(True) is not None:
+                    destination_name = f'to {destination_name}'
+            else:
+                destination_name = 'to a mysterious place'
+                color = COLOR_MAP['White']
 
         new_msg = f"\x08\x05{color}Warp {destination_name}?\x05\40\x09\x01\x01\x1b\x05\x42OK\x01No\x05\40"
         update_message_by_id(messages, id, new_msg)
diff --git a/version.py b/version.py
index e9220fa4e..217ca869a 100644
--- a/version.py
+++ b/version.py
@@ -1 +1 @@
-__version__ = '6.2.178 f.LUM'
+__version__ = '6.2.179 f.LUM'