diff --git a/FS25_ADSmartPickup/adFieldWork.lua b/FS25_ADSmartPickup/adFieldWork.lua
index df734f9..2812521 100644
--- a/FS25_ADSmartPickup/adFieldWork.lua
+++ b/FS25_ADSmartPickup/adFieldWork.lua
@@ -209,7 +209,8 @@ end
 local function sourceCourse(adEnv, field, source)
     local saved = coursesOf(field.id)[source]
     if saved ~= nil then return saved end
-    local vehicleId = source == "rake" and field.rakeVehicleId or source == "harvester" and field.harvestVehicleId or field.mowVehicleId
+    local vehicleIds = {mower = field.mowVehicleId, rake = field.rakeVehicleId, harvester = field.harvestVehicleId}
+    local vehicleId = vehicleIds[source]
     if vehicleId == nil then return nil end
     for _, vehicle in ipairs(ADRunsController.getFarmVehicles(adEnv)) do
         if ADRunsController.getVehicleId(vehicle) == vehicleId then return ADCpBridge.getCourse(vehicle) end
diff --git a/FS25_ADSmartPickup/gui/SmartPickupFieldTab.lua b/FS25_ADSmartPickup/gui/SmartPickupFieldTab.lua
index 0d83ef9..2651aed 100644
--- a/FS25_ADSmartPickup/gui/SmartPickupFieldTab.lua
+++ b/FS25_ADSmartPickup/gui/SmartPickupFieldTab.lua
@@ -389,8 +389,6 @@ function SmartPickupFrame:onClickFieldRow(state, data)
             return
         elseif data.kind == "fieldTarget" then
             ADFieldJobs.setTarget(id, data.values ~= nil and data.values[state] or "")
-        elseif id == nil then
-            return
         elseif SmartPickupFrame.PLAN_CHOICES[data.kind] ~= nil then
             local value = data.values ~= nil and data.values[state] or nil
             if value ~= nil then ADFieldJobs.setPlan(id, {[SmartPickupFrame.PLAN_CHOICES[data.kind]] = value}) end