LPS-34265 Prevent UpgradeCompany from nulls