diff --git a/mods/common/lua/production.lua b/mods/common/lua/production.lua
index d03b129ef0..5beaa1f899 100644
--- a/mods/common/lua/production.lua
+++ b/mods/common/lua/production.lua
@@ -17,9 +17,15 @@ Production.PerFactoryQueueIsBusy = function(factory)
 end
 
 Production.SetRallyPoint = function(factory, location)
-	Actor.Trait(factory, "RallyPoint").rallyPoint = location.Location
+	local srp = Actor.Trait(factory, "RallyPoint")
+	if srp ~= nil then
+		srp.rallyPoint = location.Location
+	end
 end
 
 Production.SetPrimaryBuilding = function(factory)
-	Actor.Trait(factory, "PrimaryBuilding"):SetPrimaryProducer(factory, true)
+	local pb = Actor.TraitOrDefault(factory, "PrimaryBuilding")
+	if pb ~= nil then
+		pb:SetPrimaryProducer(factory, true)
+	end
 end