diff --git a/exp_scenario/module/control/degrading_tiles.lua b/exp_scenario/module/control/degrading_tiles.lua
index 9eec9c26..6a8282b0 100644
--- a/exp_scenario/module/control/degrading_tiles.lua
+++ b/exp_scenario/module/control/degrading_tiles.lua
@@ -16,7 +16,7 @@ end
 
 --- Replace a tile with the next tile in the degrade chain
 --- @param surface LuaSurface
---- @param position MapPosition
+--- @param position MapPosition.struct
 local function degrade_tile(surface, position)
     local tile = surface.get_tile(position)
     local tile_name = tile.name
@@ -58,7 +58,7 @@ end
 
 --- Gets the average tile strengths around position
 --- @param surface LuaSurface
---- @param position MapPosition
+--- @param position MapPosition.struct
 --- @return number?
 local function get_tile_strength(surface, position)
     local tile = surface.get_tile(position)
diff --git a/exp_scenario/module/control/spawn_area.lua b/exp_scenario/module/control/spawn_area.lua
index cceb15fa..365aba9d 100644
--- a/exp_scenario/module/control/spawn_area.lua
+++ b/exp_scenario/module/control/spawn_area.lua
@@ -10,8 +10,8 @@ local config = require("modules.exp_legacy.config.spawn_area")
 --- @return MapPosition.struct
 local function apply_offset(position, offset)
     return {
-        x = (position.x or position[1]) + (offset.x or offset[1]),
-        y = (position.y or position[2]) + (offset.y or offset[2])
+        x = assert(position.x or position[1]) + assert(offset.x or offset[1]),
+        y = assert(position.y or position[2]) + assert(offset.y or offset[2])
     }
 end
 
@@ -21,8 +21,8 @@ end
 --- @param x_index number
 --- @param y_index number
 local function apply_offset_to_array(positions, offset, x_index, y_index)
-    local x = (offset.x or offset[1])
-    local y = (offset.y or offset[2])
+    local x = assert(offset.x or offset[1])
+    local y = assert(offset.y or offset[2])
     for _, position in ipairs(positions) do
         position[x_index] = position[x_index] + x
         position[y_index] = position[y_index] + y
diff --git a/exp_scenario/module/gui/production_stats.lua b/exp_scenario/module/gui/production_stats.lua
index 10963298..bc6cac8a 100644
--- a/exp_scenario/module/gui/production_stats.lua
+++ b/exp_scenario/module/gui/production_stats.lua
@@ -184,7 +184,7 @@ end
 --- @param item_selector LuaGuiElement
 function Elements.production_table.remove_row(production_table, item_selector)
     local rows = Elements.production_table.data[production_table].rows
-    local row = rows[item_selector.index]
+    local row = assert(rows[item_selector.index])
     rows[item_selector.index] = nil
     Gui.destroy_if_valid(item_selector)
     for _, element in pairs(row) do
@@ -197,7 +197,7 @@ end
 --- @param item_selector LuaGuiElement
 function Elements.production_table.reset_row(production_table, item_selector)
     local rows = Elements.production_table.data[production_table].rows
-    local row = rows[item_selector.index]
+    local row = assert(rows[item_selector.index])
     row.production.caption = "0.00"
     row.consumption.caption = "0.00"
     row.net.caption = "0.00"
@@ -210,7 +210,7 @@ end
 --- @param row_data ExpGui_ProductionStats.elements.production_table.row_data
 function Elements.production_table.refresh_row(production_table, item_selector, row_data)
     local rows = Elements.production_table.data[production_table].rows
-    local row = rows[item_selector.index]
+    local row = assert(rows[item_selector.index])
     row.production.caption = row_data.production
     row.consumption.caption = row_data.consumption
     row.net.caption = row_data.net