From 9dcab7683c0fccbd0f473cd3f717c007f79e0f9c Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sat, 15 Sep 2018 21:41:14 +0300
Subject: [PATCH] Error handling

---
 app/Models/PaymentMethod.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/PaymentMethod.php b/app/Models/PaymentMethod.php
index c4efaac6a6ab..4042bfcebdb3 100644
--- a/app/Models/PaymentMethod.php
+++ b/app/Models/PaymentMethod.php
@@ -255,7 +255,7 @@ class PaymentMethod extends EntityModel
 
 PaymentMethod::deleting(function ($paymentMethod) {
     $accountGatewayToken = $paymentMethod->account_gateway_token;
-    if ($accountGatewayToken->default_payment_method_id == $paymentMethod->id) {
+    if ($accountGatewayToken && $accountGatewayToken->default_payment_method_id == $paymentMethod->id) {
         $newDefault = $accountGatewayToken->payment_methods->first(function ($paymentMethdod) use ($accountGatewayToken) {
             return $paymentMethdod->id != $accountGatewayToken->default_payment_method_id;
         });