Index: ps/trunk/binaries/data/mods/public/simulation/components/UnitAI.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/UnitAI.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/UnitAI.js
@@ -4975,7 +4975,13 @@
 	if (queued)
 		this.PushOrder(type, data);
 	else
+	{
+		// May happen only if an order arrives on the same turn the unit is garrisoned
+		// in that case, just forget the order as this will lead to a weird state
+		if (this.IsGarrisoned() && !this.IsTurret() && type != "Ungarrison")
+			return;
 		this.ReplaceOrder(type, data);
+	}
 };
 
 /**