diff --git a/scripts/FastTravel.rb b/scripts/FastTravel.rb
index 2be420b..b6584d5 100644
--- a/scripts/FastTravel.rb
+++ b/scripts/FastTravel.rb
@@ -99,7 +99,7 @@ class FastTravel
   
   #WME
   def update_location_name_text
-    if ZONES[$game_fasttravel.zone].locations == nil || @legacy_ui
+    if ZONES[$game_fasttravel.zone].locations == nil || ZONES[$game_fasttravel.zone].maps[@selected_location] == nil || @legacy_ui
       return
     end
     @location_name_text.bitmap.clear
diff --git a/scripts/Spriteset_Map.rb b/scripts/Spriteset_Map.rb
index 4935d25..25943b5 100644
--- a/scripts/Spriteset_Map.rb
+++ b/scripts/Spriteset_Map.rb
@@ -236,7 +236,7 @@ class Spriteset_Map
           raise 'invalid particle type'
         end
         @particles = ParticleLayer.new(@viewport_particles, klass, count)
-        @viewport_particles.z = (layer == :front) ? 500 : -400
+        @viewport_particles.z = (layer == :front) ? 499 : -400
       end
     end
     # Update bg plane