From 0aea8bc991bd47f655ac32f4d4445bcad86693dc Mon Sep 17 00:00:00 2001
From: Andrew Berezovsky <andrew.berezovsky@gmail.com>
Date: Mon, 28 Aug 2017 19:36:16 +0300
Subject: [PATCH] Issue #2905147 by duozersk: Commerce Log: Call to a member
 function label() on null

---
 modules/log/src/EventSubscriber/CartEventSubscriber.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/log/src/EventSubscriber/CartEventSubscriber.php b/modules/log/src/EventSubscriber/CartEventSubscriber.php
index f95e7bd30e..79d0f284d7 100644
--- a/modules/log/src/EventSubscriber/CartEventSubscriber.php
+++ b/modules/log/src/EventSubscriber/CartEventSubscriber.php
@@ -48,7 +48,7 @@ public function onCartEntityAdd(CartEntityAddEvent $event) {
     $cart = $event->getCart();
     $purchased_entity = $event->getOrderItem()->getPurchasedEntity();
     $this->logStorage->generate($cart, 'cart_entity_added', [
-      'purchased_entity_label' => $purchased_entity->label(),
+      'purchased_entity_label' => $purchased_entity ? $purchased_entity->label() : NULL,
     ])->save();
   }
 
@@ -60,9 +60,9 @@ public function onCartEntityAdd(CartEntityAddEvent $event) {
    */
   public function onCartOrderItemRemove(CartOrderItemRemoveEvent $event) {
     $cart = $event->getCart();
-    $order_item = $event->getOrderItem();
+    $purchased_entity = $event->getOrderItem()->getPurchasedEntity();
     $this->logStorage->generate($cart, 'cart_item_removed', [
-      'purchased_entity_label' => $order_item->getPurchasedEntity()->label(),
+      'purchased_entity_label' => $purchased_entity ? $purchased_entity->label() : NULL,
     ])->save();
   }