diff --git a/scripts/FastTravel.rb b/scripts/FastTravel.rb
index 52cfadb..d050ad7 100644
--- a/scripts/FastTravel.rb
+++ b/scripts/FastTravel.rb
@@ -225,6 +225,7 @@ class FastTravel
   def update
     zone = ZONES[$game_fasttravel.zone]
     
+    zone = zone == nil ? Zone.new("", {}, {}) : zone
     if zone.locations != nil && !@legacy_ui
       @arrows_timer += 1
       if @arrows_timer >= 30
diff --git a/src/eventthread.cpp b/src/eventthread.cpp
index d57e1a8..ee6664b 100644
--- a/src/eventthread.cpp
+++ b/src/eventthread.cpp
@@ -433,6 +433,9 @@ void EventThread::process(RGSSThreadData &rtData){
 		// more mouse support for sunshine :3c
 		case SDL_EVENT_MOUSE_WHEEL:
 			{
+				if (event.window.windowID != SDL_GetWindowID(rtData.window))
+					break;
+
 				mouseState.wheelFlipped = event.wheel.direction == SDL_MOUSEWHEEL_FLIPPED;
 				mouseState.wheelX += event.wheel.x;
 				mouseState.wheelY += event.wheel.y;