Add vendor_id, tweak 404 handling.