diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua
index da1510608..b877fa004 100644
--- a/Moose Development/Moose/Wrapper/Airbase.lua	
+++ b/Moose Development/Moose/Wrapper/Airbase.lua	
@@ -929,7 +929,7 @@ end
 function AIRBASE:GetWarehouse()
   local warehouse=nil --DCS#Warehouse
   local airbase=self:GetDCSObject()
-  if airbase then
+  if airbase and Airbase.getWarehouse then
     warehouse=airbase:getWarehouse()
   end
   return warehouse
diff --git a/Moose Development/Moose/Wrapper/Storage.lua b/Moose Development/Moose/Wrapper/Storage.lua
index 931bd7f6b..7d4b6da12 100644
--- a/Moose Development/Moose/Wrapper/Storage.lua	
+++ b/Moose Development/Moose/Wrapper/Storage.lua	
@@ -168,8 +168,10 @@ function STORAGE:New(AirbaseName)
   local self=BASE:Inherit(self, BASE:New()) -- #STORAGE
 
   self.airbase=Airbase.getByName(AirbaseName)
-
-  self.warehouse=self.airbase:getWarehouse()
+  
+  if Airbase.getWarehouse then
+    self.warehouse=self.airbase:getWarehouse()
+  end
 
   self.lid = string.format("STORAGE %s", AirbaseName)