Don't log dead letters at shutdown
Make vendorState optional