diff --git a/OpenRA.Game/Traits/PrimaryBuilding.cs b/OpenRA.Game/Traits/PrimaryBuilding.cs
index a260a5a426..a86688c1eb 100644
--- a/OpenRA.Game/Traits/PrimaryBuilding.cs
+++ b/OpenRA.Game/Traits/PrimaryBuilding.cs
@@ -70,7 +70,7 @@ namespace OpenRA.Traits
 	{
 		public static bool IsPrimaryBuilding(this Actor a)
 		{
-			var pb = a.traits.Get<PrimaryBuilding>();
+			var pb = a.traits.GetOrDefault<PrimaryBuilding>();
 			return pb != null && pb.IsPrimary;
 		}
 	}