diff --git a/.gitignore b/.gitignore
index f908db72e..5e42c0c93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -222,3 +222,7 @@ _gsdata_/
 .gitignore
 Moose Test Missions/MOOSE_Test_Template.miz
 Moose Development/Moose/.vscode/launch.json
+MooseCodeWS.code-workspace
+.gitignore
+.gitignore
+/.gitignore
diff --git a/Moose Development/Moose/Functional/Warehouse.lua b/Moose Development/Moose/Functional/Warehouse.lua
index bd98267cb..999eb97c9 100644
--- a/Moose Development/Moose/Functional/Warehouse.lua	
+++ b/Moose Development/Moose/Functional/Warehouse.lua	
@@ -4894,8 +4894,14 @@ function WAREHOUSE:onafterChangeCountry(From, Event, To, Country)
   self.queue={}
 
   -- Airbase could have been captured before and already belongs to the new coalition.
-  local airbase=AIRBASE:FindByName(self.airbasename)
-  local airbasecoaltion=airbase:GetCoalition()
+  -- Check if Warehouse has a arbiase atthached
+  local airbasecoaltion
+  if self.airbase ~= nil then
+    local airbase=AIRBASE:FindByName(self.airbasename)
+    airbasecoaltion=airbase:GetCoalition() 
+  else -- Warehouse has no airbase attached so just keep whatever, self.airbase will still be nil since CoalitionNew will not be nil if Warehouse have a airbse attacjed.
+    airbasecoaltion = nil  
+  end
 
   if CoalitionNew==airbasecoaltion then
     -- Airbase already owned by the coalition that captured the warehouse. Airbase can be used by this warehouse.