diff --git a/binaries/data/mods/public/simulation/components/UnitAI.js b/binaries/data/mods/public/simulation/components/UnitAI.js
index 925ba1b10f..4b831598c9 100644
--- a/binaries/data/mods/public/simulation/components/UnitAI.js
+++ b/binaries/data/mods/public/simulation/components/UnitAI.js
@@ -1120,7 +1120,7 @@ var UnitFsmSpec = {
 						{
 							// Let the Timer logic handle this
 							this.StartTimer(0);
-							return;
+							return false;
 						}
 						
 						// No rate, give up on gathering
@@ -1144,6 +1144,7 @@ var UnitFsmSpec = {
 						var typename = "gather_" + this.order.data.type.specific;
 						this.SelectAnimation(typename, false, 1.0, typename);
 					}
+					return false;
 				},
 
 				"leave": function() {
@@ -1532,6 +1533,7 @@ var UnitFsmSpec = {
 
 					this.SelectAnimation("build", false, 1.0, "build");
 					this.StartTimer(1000, 1000);
+					return false;
 				},
 
 				"leave": function() {
@@ -1662,7 +1664,7 @@ var UnitFsmSpec = {
 										cmpResourceGatherer.CommitResources(dropsiteTypes);
 								}
 								
-								return;
+								return false;
 							}
 						}
 						else
@@ -1672,7 +1674,7 @@ var UnitFsmSpec = {
 							if (this.MoveToTarget(target))
 							{
 								this.SetNextState("APPROACHING");
-								return;
+								return false;
 							}
 						}
 					}