Index: binaries/data/mods/public/simulation/components/GarrisonHolder.js
===================================================================
--- binaries/data/mods/public/simulation/components/GarrisonHolder.js
+++ binaries/data/mods/public/simulation/components/GarrisonHolder.js
@@ -10,9 +10,6 @@
 		"</attribute>" +
 		"<text/>" +
 	"</element>" +
-	"<element name='EjectHealth' a:help='Percentage of maximum health below which this holder no longer allows garrisoning'>" +
-		"<ref name='nonNegativeDecimal'/>" +
-	"</element>" +
 	"<element name='EjectClassesOnDestroy' a:help='Classes of entities to be ejected on destroy. Others are killed'>" +
 		"<attribute name='datatype'>" +
 			"<value>tokens</value>" +
@@ -26,6 +23,11 @@
 		"<ref name='nonNegativeDecimal'/>" +
 	"</element>" +
 	"<optional>" +
+		"<element name='EjectHealth' a:help='Percentage of maximum health below which this holder no longer allows garrisoning'>" +
+			"<ref name='nonNegativeDecimal'/>" +
+		"</element>" +
+	"</optional>" +
+	"<optional>" +
 		"<element name='Pickup' a:help='This garrisonHolder will move to pick up units to be garrisoned'>" +
 			"<data type='boolean'/>" +
 		"</element>" +
@@ -504,8 +506,11 @@
 
 GarrisonHolder.prototype.HasEnoughHealth = function()
 {
+	if (this.template.EjectHealth === undefined)
+		return true;
+
 	let cmpHealth = Engine.QueryInterface(this.entity, IID_Health);
-	return cmpHealth.GetHitpoints() > Math.floor(+this.template.EjectHealth * cmpHealth.GetMaxHitpoints());
+	return !cmpHealth || cmpHealth.GetHitpoints() > Math.floor(+this.template.EjectHealth * cmpHealth.GetMaxHitpoints());
 };
 
 /**
Index: binaries/data/mods/public/simulation/components/tests/test_GarrisonHolder.js
===================================================================
--- binaries/data/mods/public/simulation/components/tests/test_GarrisonHolder.js
+++ binaries/data/mods/public/simulation/components/tests/test_GarrisonHolder.js
@@ -27,11 +27,6 @@
 	"GetOwner": () => player
 });
 
-AddMock(garrisonHolderId, IID_Health, {
-	"GetHitpoints": () => 50,
-	"GetMaxHitpoints": () => 600
-});
-
 AddMock(player, IID_Player, {
 	"IsAlly": id => true,
 	"IsMutualAlly": id => true,
@@ -114,6 +109,42 @@
 	}
 });
 
+let testGarrisonAllowed = function()
+{
+	TS_ASSERT_EQUALS(cmpGarrisonHolder.Garrison(enemyUnitId), false);
+	TS_ASSERT_EQUALS(cmpGarrisonHolder.Garrison(unitToGarrisonId), true);
+	TS_ASSERT_EQUALS(cmpGarrisonHolder.Eject(unitToGarrisonId), true);
+	TS_ASSERT_EQUALS(cmpGarrisonHolder.Garrison(unitToGarrisonId), true);
+	for (let entity of garrisonedEntitiesList)
+		TS_ASSERT_EQUALS(cmpGarrisonHolder.Garrison(entity), true);
+	TS_ASSERT_EQUALS(cmpGarrisonHolder.IsFull(), true);
+	TS_ASSERT_EQUALS(cmpGarrisonHolder.CanPickup(unitToGarrisonId), false);
+
+	TS_ASSERT_EQUALS(cmpGarrisonHolder.UnloadTemplate("spart_infantry_archer_a", 2, false, false), true);
+	TS_ASSERT_UNEVAL_EQUALS(cmpGarrisonHolder.GetEntities(), [24, 25, 26, 27, 28, 29, 30, 31, 32]);
+	TS_ASSERT_EQUALS(cmpGarrisonHolder.UnloadAllByOwner(friendlyPlayer, false), true);
+	TS_ASSERT_UNEVAL_EQUALS(cmpGarrisonHolder.GetEntities(), [24, 25, 26, 27]);
+	TS_ASSERT_EQUALS(cmpGarrisonHolder.GetGarrisonedEntitiesCount(), 4);
+	TS_ASSERT_EQUALS(cmpGarrisonHolder.IsEjectable(25), true);
+	TS_ASSERT_EQUALS(cmpGarrisonHolder.Unload(25), true);
+	TS_ASSERT_EQUALS(cmpGarrisonHolder.IsEjectable(25), false);
+	TS_ASSERT_EQUALS(cmpGarrisonHolder.PerformEject([25], false), false);
+	TS_ASSERT_EQUALS(cmpGarrisonHolder.PerformEject([], false), true);
+	TS_ASSERT_UNEVAL_EQUALS(cmpGarrisonHolder.GetEntities(), [24, 26, 27]);
+	TS_ASSERT_EQUALS(cmpGarrisonHolder.GetGarrisonedEntitiesCount(), 3);
+	TS_ASSERT_EQUALS(cmpGarrisonHolder.IsFull(), false);
+	TS_ASSERT_EQUALS(cmpGarrisonHolder.UnloadAll(), true);
+	TS_ASSERT_UNEVAL_EQUALS(cmpGarrisonHolder.GetEntities(), []);
+}
+
+// No health component yet.
+testGarrisonAllowed();
+
+AddMock(garrisonHolderId, IID_Health, {
+	"GetHitpoints": () => 50,
+	"GetMaxHitpoints": () => 600
+});
+
 cmpGarrisonHolder.AllowGarrisoning(true, "callerID1");
 cmpGarrisonHolder.AllowGarrisoning(false, 5);
 TS_ASSERT_EQUALS(cmpGarrisonHolder.Garrison(unitToGarrisonId), false);
@@ -143,28 +174,28 @@
 	"GetMaxHitpoints": () => 600
 });
 
-TS_ASSERT_EQUALS(cmpGarrisonHolder.HasEnoughHealth(), true);
-TS_ASSERT_EQUALS(cmpGarrisonHolder.Garrison(enemyUnitId), false);
-TS_ASSERT_EQUALS(cmpGarrisonHolder.Garrison(unitToGarrisonId), true);
-TS_ASSERT_EQUALS(cmpGarrisonHolder.Eject(unitToGarrisonId), true);
-TS_ASSERT_EQUALS(cmpGarrisonHolder.Garrison(unitToGarrisonId), true);
-for (let entity of garrisonedEntitiesList)
-	TS_ASSERT_EQUALS(cmpGarrisonHolder.Garrison(entity), true);
-TS_ASSERT_EQUALS(cmpGarrisonHolder.IsFull(), true);
-TS_ASSERT_EQUALS(cmpGarrisonHolder.CanPickup(unitToGarrisonId), false);
+testGarrisonAllowed();
 
-TS_ASSERT_EQUALS(cmpGarrisonHolder.UnloadTemplate("spart_infantry_archer_a", 2, false, false), true);
-TS_ASSERT_UNEVAL_EQUALS(cmpGarrisonHolder.GetEntities(), [24, 25, 26, 27, 28, 29, 30, 31, 32]);
-TS_ASSERT_EQUALS(cmpGarrisonHolder.UnloadAllByOwner(friendlyPlayer, false), true);
-TS_ASSERT_UNEVAL_EQUALS(cmpGarrisonHolder.GetEntities(), [24, 25, 26, 27]);
-TS_ASSERT_EQUALS(cmpGarrisonHolder.GetGarrisonedEntitiesCount(), 4);
-TS_ASSERT_EQUALS(cmpGarrisonHolder.IsEjectable(25), true);
-TS_ASSERT_EQUALS(cmpGarrisonHolder.Unload(25), true);
-TS_ASSERT_EQUALS(cmpGarrisonHolder.IsEjectable(25), false);
-TS_ASSERT_EQUALS(cmpGarrisonHolder.PerformEject([25], false), false);
-TS_ASSERT_EQUALS(cmpGarrisonHolder.PerformEject([], false), true);
-TS_ASSERT_UNEVAL_EQUALS(cmpGarrisonHolder.GetEntities(), [24, 26, 27]);
-TS_ASSERT_EQUALS(cmpGarrisonHolder.GetGarrisonedEntitiesCount(), 3);
-TS_ASSERT_EQUALS(cmpGarrisonHolder.IsFull(), false);
-TS_ASSERT_EQUALS(cmpGarrisonHolder.UnloadAll(), true);
-TS_ASSERT_UNEVAL_EQUALS(cmpGarrisonHolder.GetEntities(), []);
+// No eject health.
+cmpGarrisonHolder = ConstructComponent(garrisonHolderId, "GarrisonHolder", {
+	"Max": 10,
+	"List": { "_string": "Infantry+Cavalry" },
+	"EjectClassesOnDestroy": { "_string": "Infantry" },
+	"BuffHeal": 1,
+	"LoadingRange": 2.1,
+	"Pickup": false,
+	"VisibleGarrisonPoints": {
+		"archer1": {
+			"X": 12,
+			"Y": 5,
+			"Z": 6
+		},
+		"archer2": {
+			"X": 15,
+			"Y": 5,
+			"Z": 6
+		}
+	}
+});
+
+testGarrisonAllowed();