Updated findPrimary and findSecondary to simply return null with no error if a segment isnt found.