Index: binaries/data/mods/public/gui/credits/texts/programming.json
===================================================================
--- binaries/data/mods/public/gui/credits/texts/programming.json
+++ binaries/data/mods/public/gui/credits/texts/programming.json
@@ -64,6 +64,7 @@
 			{"nick": "dax", "name": "Dacian Fiordean"},
 			{"nick": "deebee", "name": "Deepak Anthony"},
 			{"nick": "Deiz"},
+			{"nick": "der-spaete-jo", "name": "Johannes Katzer"},
 			{"nick": "Dietger", "name": "Dietger van Antwerpen"},
 			{"nick": "dp304"},
 			{"nick": "dpiquet", "name": "Damien Piquet"},
Index: binaries/data/mods/public/simulation/components/UnitAI.js
===================================================================
--- binaries/data/mods/public/simulation/components/UnitAI.js
+++ binaries/data/mods/public/simulation/components/UnitAI.js
@@ -636,9 +636,20 @@
 		// Try to move to the dropsite
 		if (this.MoveToTargetRange(this.order.data.target, IID_ResourceGatherer))
 		{
-			// We've started walking to the target
-			this.SetNextState("INDIVIDUAL.RETURNRESOURCE.APPROACHING");
-			return;
+			if (this.CanReturnResource(this.order.data.target, true))
+			{
+				// We've started walking to the target
+				this.SetNextState("INDIVIDUAL.RETURNRESOURCE.APPROACHING");
+				return;
+			}
+			else
+			{
+				// We've started walking to a dropoff zone, 
+				// but we actually cannot return resources.
+				// So we should just walk.
+				this.SetNextState("INDIVIDUAL.WALKING");
+				return;
+			}
 		}
 		// Oops, we can't reach the dropsite.
 		// Maybe we should try to pick another dropsite, to find an