diff --git a/data/lang/module-cargorun/en.json b/data/lang/module-cargorun/en.json
index 13d5c9a04..2d752b3e6 100644
--- a/data/lang/module-cargorun/en.json
+++ b/data/lang/module-cargorun/en.json
@@ -499,6 +499,10 @@
     "description": "custom cargo",
     "message": "Titanium"
   },
+  "TOO_LATE_TO_PICK_UP": {
+    "description": "",
+    "message": "You are much too late! Your performance is so bad that I am cancelling my contract with you."
+  },
   "TUNGSTEN": {
     "description": "custom cargo",
     "message": "Tungsten"
diff --git a/data/modules/CargoRun/CargoRun.lua b/data/modules/CargoRun/CargoRun.lua
index 016ea7b8a..713444772 100644
--- a/data/modules/CargoRun/CargoRun.lua
+++ b/data/modules/CargoRun/CargoRun.lua
@@ -851,12 +851,22 @@ local onShipDocked = function (player, station)
 	-- Now we have space pick up cargo as well
 	for ref,mission in pairs(missions) do
 		if mission.location == station.path and mission.pickup and not mission.cargo_picked_up then
-			if (player.totalCargo - player.usedCargo) < mission.amount then
-				Comms.ImportantMessage(l.YOU_DO_NOT_HAVE_ENOUGH_EMPTY_CARGO_SPACE, mission.client.name)
+			if Game.time < mission.due then
+				if (player.totalCargo - player.usedCargo) < mission.amount then
+					Comms.ImportantMessage(l.YOU_DO_NOT_HAVE_ENOUGH_EMPTY_CARGO_SPACE, mission.client.name)
+				else
+					Game.player:AddEquip(mission.cargotype, mission.amount, "cargo")
+					mission.cargo_picked_up = true
+					Comms.ImportantMessage(l.WE_HAVE_LOADED_UP_THE_CARGO_ON_YOUR_SHIP, mission.client.name)
+				end
 			else
-				Game.player:AddEquip(mission.cargotype, mission.amount, "cargo")
-				mission.cargo_picked_up = true
-				Comms.ImportantMessage(l.WE_HAVE_LOADED_UP_THE_CARGO_ON_YOUR_SHIP, mission.client.name)
+				local oldReputation = Character.persistent.player.reputation
+				Character.persistent.player.reputation = Character.persistent.player.reputation - (mission.localdelivery and 1 or 1.5)
+				Comms.ImportantMessage(l.TOO_LATE_TO_PICK_UP, mission.client.name)
+				Event.Queue("onReputationChanged", oldReputation, Character.persistent.player.killcount,
+					Character.persistent.player.reputation, Character.persistent.player.killcount)
+				mission:Remove()
+				missions[ref] = nil
 			end
 		end
 	end