diff --git a/modules/order/src/Form/OrderForm.php b/modules/order/src/Form/OrderForm.php
index 719ed12e..e591d47e 100755
--- a/modules/order/src/Form/OrderForm.php
+++ b/modules/order/src/Form/OrderForm.php
@@ -121,8 +121,13 @@ class OrderForm extends ContentEntityForm {
       $form['uid']['#group'] = 'customer';
     }
     else {
-      $user_link = $order->getCustomer()->toLink()->toString();
-      $form['customer']['uid'] = $this->fieldAsReadOnly($this->t('Customer'), $user_link);
+      if ($user = $order->getCustomer()) {
+        $user_link = $user->toLink()->toString();
+        $form['customer']['uid'] = $this->fieldAsReadOnly($this->t('Customer'), $user_link);
+      }
+      elseif ($uid = $order->getCustomerId()) {
+        $form['customer']['uid'] = $this->fieldAsReadOnly($this->t('Customer ID (deleted)'), $uid);
+      }
     }
     if (isset($form['mail'])) {
       $form['mail']['#group'] = 'customer';
diff --git a/modules/order/src/Plugin/Field/FieldWidget/BillingProfileWidget.php b/modules/order/src/Plugin/Field/FieldWidget/BillingProfileWidget.php
index 2d0987c9..d034cc5a 100755
--- a/modules/order/src/Plugin/Field/FieldWidget/BillingProfileWidget.php
+++ b/modules/order/src/Plugin/Field/FieldWidget/BillingProfileWidget.php
@@ -75,7 +75,7 @@ class BillingProfileWidget extends WidgetBase implements ContainerFactoryPluginI
     $order = $items[$delta]->getEntity();
     $store = $order->getStore();
 
-    if (!$items[$delta]->isEmpty()) {
+    if ($items[$delta]->entity) {
       $profile = $items[$delta]->entity;
     }
     else {
diff --git a/modules/payment/src/Plugin/Commerce/CheckoutPane/PaymentInformation.php b/modules/payment/src/Plugin/Commerce/CheckoutPane/PaymentInformation.php
index 2b2e1b0e..6bab8b4e 100755
--- a/modules/payment/src/Plugin/Commerce/CheckoutPane/PaymentInformation.php
+++ b/modules/payment/src/Plugin/Commerce/CheckoutPane/PaymentInformation.php
@@ -7,6 +7,7 @@ use Drupal\commerce_payment\Plugin\Commerce\PaymentGateway\SupportsStoredPayment
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
 
 /**
  * Provides the payment information pane.
@@ -358,7 +359,8 @@ class PaymentInformation extends CheckoutPaneBase {
    *   The error message.
    */
   protected function noPaymentGatewayErrorMessage() {
-    return $this->t('No payment gateways are defined, create one first.');
+    $add_payment_gateway_link = Url::fromRoute('entity.commerce_payment_gateway.add_form')->toString();
+    return $this->t('No payment gateways are defined, <a href=@url>create</a> one first.', ['@url' => $add_payment_gateway_link]);
   }
 
 }