Fix null partnerId