[Bug 307941] new vendor match handling broken, NULL pointer reference