Bug 4507 Don't return null vendor to claims processing