diff --git a/mailchimp_ecommerce.services.yml b/mailchimp_ecommerce.services.yml
index 4b7a237..000de0b 100644
--- a/mailchimp_ecommerce.services.yml
+++ b/mailchimp_ecommerce.services.yml
@@ -6,22 +6,30 @@ services:
 
   mailchimp_ecommerce.customer_handler:
     class: '\Drupal\mailchimp_ecommerce\CustomerHandler'
-    arguments: ['@mailchimp_ecommerce.database']
+    arguments: ['@mailchimp_ecommerce.database' , '@mailchimp_ecommerce.messenger']
 
   mailchimp_ecommerce.order_handler:
     class: '\Drupal\mailchimp_ecommerce\OrderHandler'
 
   mailchimp_ecommerce.product_handler:
     class: '\Drupal\mailchimp_ecommerce\ProductHandler'
+    arguments: ['@mailchimp_ecommerce.messenger']
 
   mailchimp_ecommerce.store_handler:
     class: '\Drupal\mailchimp_ecommerce\StoreHandler'
+    arguments: ['@mailchimp_ecommerce.messenger']
 
   mailchimp_ecommerce.database:
     class: Drupal\Core\Database\Connection
     factory: Drupal\Core\Database\Database::getConnection
     arguments: [default]
 
+  mailchimp_ecommerce.messenger:
+    class: Drupal\Core\Messenger\MessengerInterface
+    factory: Drupal\Core\Messenger::messenger
+    arguments: [default]
+
+
   mailchimp_ecommerce.helper:
     class: '\Drupal\mailchimp_ecommerce\MailchimpEcommerceHelper'
     factory: ['@class_resolver', 'getInstanceFromDefinition']
diff --git a/src/CustomerHandler.php b/src/CustomerHandler.php
index 49900bd..2d1d6aa 100644
--- a/src/CustomerHandler.php
+++ b/src/CustomerHandler.php
@@ -3,6 +3,7 @@
 namespace Drupal\mailchimp_ecommerce;
 
 use Drupal\Core\Database\Connection;
+use Drupal\Core\Messenger\MessengerInterface;
 
 /**
  * Customer handler.
@@ -17,13 +18,22 @@ class CustomerHandler implements CustomerHandlerInterface {
   private $database;
 
   /**
+  * The Messenger service.
+  *
+  * @var \Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
+  /**
    * CustomerHandler constructor.
    *
    * @param \Drupal\Core\Database\Connection $database
    *   The Order Handler.
+   * @param MessengerInterface $messenger
    */
-  public function __construct(Connection $database) {
+  public function __construct(Connection $database, MessengerInterface $messenger) {
     $this->database = $database;
+    $this->messenger = $messenger;
   }
 
   /**
@@ -47,7 +57,7 @@ class CustomerHandler implements CustomerHandlerInterface {
       }
       else {
         mailchimp_ecommerce_log_error_message('Unable to delete a customer: ' . $e->getMessage());
-        drupal_set_message($e->getMessage(), 'error');
+        $this->messenger->addError($e->getMessage());
       }
     }
 
@@ -86,7 +96,7 @@ class CustomerHandler implements CustomerHandlerInterface {
     }
     catch (\Exception $e) {
       mailchimp_ecommerce_log_error_message('Unable to add a customer: ' . $e->getMessage());
-      drupal_set_message($e->getMessage(), 'error');
+      $this->messenger->addError($e->getMessage());
     }
   }
 
@@ -106,7 +116,7 @@ class CustomerHandler implements CustomerHandlerInterface {
     }
     catch (\Exception $e) {
       mailchimp_ecommerce_log_error_message('Unable to delete a customer: ' . $e->getMessage());
-      drupal_set_message($e->getMessage(), 'error');
+      $this->messenger->addError($e->getMessage());
     }
   }
   /**
diff --git a/src/OrderHandler.php b/src/OrderHandler.php
index a5cdc13..9451601 100644
--- a/src/OrderHandler.php
+++ b/src/OrderHandler.php
@@ -27,7 +27,7 @@ class OrderHandler implements OrderHandlerInterface {
     }
     catch (\Exception $e) {
       mailchimp_ecommerce_log_error_message('Unable to get order: ' . $e->getMessage());
-      drupal_set_message($e->getMessage(), 'error');
+      \Drupal::messenger()->addError($e->getMessage());
     }
 
     return NULL;
@@ -61,7 +61,7 @@ class OrderHandler implements OrderHandlerInterface {
     }
     catch (\Exception $e) {
       mailchimp_ecommerce_log_error_message('Unable to add an order: ' . $e->getMessage());
-      drupal_set_message($e->getMessage(), 'error');
+      \Drupal::messenger()->addError($e->getMessage());
     }
   }
 
@@ -81,7 +81,7 @@ class OrderHandler implements OrderHandlerInterface {
     }
     catch (\Exception $e) {
       mailchimp_ecommerce_log_error_message('Unable to update an order: ' . $e->getMessage());
-      drupal_set_message($e->getMessage(), 'error');
+      \Drupal::messenger()->addError($e->getMessage());
     }
   }
 
diff --git a/src/ProductHandler.php b/src/ProductHandler.php
index 4c1c6c6..7b9d861 100644
--- a/src/ProductHandler.php
+++ b/src/ProductHandler.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\mailchimp_ecommerce;
 
+use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\node\Entity\Node;
 use Drupal\commerce_product\Entity\Product;
 use Drupal\commerce_product\Entity\ProductVariation;
@@ -12,6 +13,21 @@ use Drupal\commerce_product\Entity\ProductVariation;
 class ProductHandler implements ProductHandlerInterface {
 
   /**
+   * The Messenger service.
+   *
+   * @var \Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+  /**
+   * ProductHandler constructor.
+   *
+   * @param MessengerInterface $messenger
+   */
+
+  public function __construct(MessengerInterface $messenger) {
+    $this->messenger = $messenger;
+  }
+  /**
    * @inheritdoc
    */
   public function addProduct($product_id, $title, $url, $image_url, $description, $type, $variants) {
@@ -35,7 +51,7 @@ class ProductHandler implements ProductHandlerInterface {
 
       //TODO: If add fails with product exists error code, run an update here.
       mailchimp_ecommerce_log_error_message('Unable to add product: ' . $e->getMessage());
-      drupal_set_message($e->getMessage(), 'error');
+      $this->messenger->addError($e->getMessage());
     }
   }
 
@@ -71,12 +87,12 @@ class ProductHandler implements ProductHandlerInterface {
     }
     catch (\Exception $e) {
       if ($e->getCode() == 404) {
-        drupal_set_message('This product doesn\'t exist in Mailchimp. Please sync all your products.');
+        $this->messenger->addWarning('This product doesn\'t exist in Mailchimp. Please sync all your products.');
       }
       else {
         // An actual error occurred; pass on the exception.
         mailchimp_ecommerce_log_error_message('Unable to update product: ' . $e->getMessage());
-        drupal_set_message($e->getMessage(), 'error');
+        $this->messenger->addError($e->getMessage());
       }
     }
   }
@@ -97,7 +113,7 @@ class ProductHandler implements ProductHandlerInterface {
     }
     catch (\Exception $e) {
       mailchimp_ecommerce_log_error_message('Unable to delete product: ' . $e->getMessage());
-      drupal_set_message($e->getMessage(), 'error');
+      $this->messenger->addError($e->getMessage());
     }
   }
 
@@ -125,7 +141,7 @@ class ProductHandler implements ProductHandlerInterface {
     }
     catch (\Exception $e) {
       mailchimp_ecommerce_log_error_message('Unable to add product variant: ' . $e->getMessage());
-      drupal_set_message($e->getMessage(), 'error');
+      $this->messenger->addError($e->getMessage());
     }
   }
 
@@ -153,7 +169,7 @@ class ProductHandler implements ProductHandlerInterface {
     }
     catch (\Exception $e) {
       mailchimp_ecommerce_log_error_message('Unable to get product variant: ' . $e->getMessage());
-      drupal_set_message($e->getMessage(), 'error');
+      $this->messenger->addError($e->getMessage());
     }
 
     return $product_variant;
@@ -230,7 +246,7 @@ class ProductHandler implements ProductHandlerInterface {
     }
     catch (\Exception $e) {
       mailchimp_ecommerce_log_error_message('Unable to delete product variant: ' . $e->getMessage());
-      drupal_set_message($e->getMessage(), 'error');
+      $this->messenger->addError($e->getMessage());
     }
   }
 
diff --git a/src/StoreHandler.php b/src/StoreHandler.php
index 8bacb7c..546f26f 100644
--- a/src/StoreHandler.php
+++ b/src/StoreHandler.php
@@ -2,11 +2,31 @@
 
 namespace Drupal\mailchimp_ecommerce;
 
+use Drupal\Core\Messenger\MessengerInterface;
 /**
  * Store handler.
  */
 class StoreHandler implements StoreHandlerInterface {
 
+
+  /**
+   * The Messenger service.
+   *
+   * @var \Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
+  /**
+   * StoreHandler constructor.
+   *
+   * @param MessengerInterface $messenger
+   */
+
+  public function __construct( MessengerInterface $messenger) {
+    $this->messenger = $messenger;
+  }
+
+
   /**
    * @inheritdoc
    */
@@ -23,7 +43,7 @@ class StoreHandler implements StoreHandlerInterface {
       }
       else {
         mailchimp_ecommerce_log_error_message('Unable to get store: ' . $e->getMessage());
-        drupal_set_message($e->getMessage(), 'error');
+        $this->messenger->addError($e->getMessage());
       }
     }
 
@@ -48,7 +68,7 @@ class StoreHandler implements StoreHandlerInterface {
     }
     catch (\Exception $e) {
       mailchimp_ecommerce_log_error_message('Unable to add a new store: ' . $e->getMessage());
-      drupal_set_message($e->getMessage(), 'error');
+      $this->messenger->addError($e->getMessage());
     }
   }
 
@@ -68,7 +88,7 @@ class StoreHandler implements StoreHandlerInterface {
     }
     catch (\Exception $e) {
       mailchimp_ecommerce_log_error_message('Unable to update a store: ' . $e->getMessage());
-      drupal_set_message($e->getMessage(), 'error');
+      $this->messenger->addError($e->getMessage());
     }
   }