From c495f31900cc2250bb63bcd57242d518aa894d92 Mon Sep 17 00:00:00 2001
From: Mahesh Singh <mahesh721@webkul.com>
Date: Fri, 1 Feb 2019 00:44:04 +0530
Subject: [PATCH] issue #20380 fixed for 2.2

---
 app/code/Magento/Sales/Model/Order.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index 1972aa71080c8..8b58f7abb6a27 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -1298,12 +1298,12 @@ public function getTrackingNumbers()
      * Retrieve shipping method
      *
      * @param bool $asObject return carrier code and shipping method data as object
-     * @return string|\Magento\Framework\DataObject
+     * @return string|null|\Magento\Framework\DataObject
      */
     public function getShippingMethod($asObject = false)
     {
         $shippingMethod = parent::getShippingMethod();
-        if (!$asObject) {
+        if (!$asObject || !$shippingMethod) {
             return $shippingMethod;
         } else {
             list($carrierCode, $method) = explode('_', $shippingMethod, 2);