diff --git a/app/Console/Commands/S3Cleanup.php b/app/Console/Commands/S3Cleanup.php
index 6aa4d2d3b1d4..d20362c8f303 100644
--- a/app/Console/Commands/S3Cleanup.php
+++ b/app/Console/Commands/S3Cleanup.php
@@ -15,6 +15,8 @@ class S3Cleanup extends Command
      */
     protected $signature = 'ninja:s3-cleanup';
 
+    protected $log = '';
+
     /**
      * The console command description.
      *
diff --git a/app/Http/Controllers/ClientPortal/NinjaPlanController.php b/app/Http/Controllers/ClientPortal/NinjaPlanController.php
index 433663923f86..70b66f087791 100644
--- a/app/Http/Controllers/ClientPortal/NinjaPlanController.php
+++ b/app/Http/Controllers/ClientPortal/NinjaPlanController.php
@@ -18,10 +18,10 @@ use App\Libraries\MultiDB;
 use App\Models\ClientContact;
 use App\Models\Company;
 use App\Utils\Ninja;
-use Auth;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Auth;
 
 class NinjaPlanController extends Controller
 {
diff --git a/app/Mail/TemplateEmail.php b/app/Mail/TemplateEmail.php
index bbfabebc09d0..98d8609c2263 100644
--- a/app/Mail/TemplateEmail.php
+++ b/app/Mail/TemplateEmail.php
@@ -126,6 +126,7 @@ class TemplateEmail extends Mailable
         if($this->invitation->invoice && $settings->ubl_email_attachment && $this->company->account->hasFeature(Account::FEATURE_DOCUMENTS)){
 
             $ubl_string = CreateUbl::dispatchNow($this->invitation->invoice);
+
             $this->attachData($ubl_string, $this->invitation->invoice->getFileName('xml'));
             
         }
diff --git a/app/Models/ClientGatewayToken.php b/app/Models/ClientGatewayToken.php
index a3928ce4bf79..2aed46bf9edc 100644
--- a/app/Models/ClientGatewayToken.php
+++ b/app/Models/ClientGatewayToken.php
@@ -13,10 +13,12 @@ namespace App\Models;
 
 use App\Utils\Traits\MakesDates;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 class ClientGatewayToken extends BaseModel
 {
     use MakesDates;
+    use SoftDeletes;
 
     protected $casts = [
         'meta' => 'object',
diff --git a/app/Observers/InvoiceObserver.php b/app/Observers/InvoiceObserver.php
index 869a0310364e..606d37c50a80 100644
--- a/app/Observers/InvoiceObserver.php
+++ b/app/Observers/InvoiceObserver.php
@@ -46,7 +46,7 @@ class InvoiceObserver
      * @return void
      */
     public function updated(Invoice $invoice)
-    {nlog("updated");
+    {
         $subscriptions = Webhook::where('company_id', $invoice->company->id)
                             ->where('event_id', Webhook::EVENT_UPDATE_INVOICE)
                             ->exists();
diff --git a/app/PaymentDrivers/BaseDriver.php b/app/PaymentDrivers/BaseDriver.php
index 45cd0b1c3e6c..be410cf1134c 100644
--- a/app/PaymentDrivers/BaseDriver.php
+++ b/app/PaymentDrivers/BaseDriver.php
@@ -205,7 +205,6 @@ class BaseDriver extends AbstractPaymentDriver
 
         $invoices->each(function ($invoice) use ($payment) {
             event(new InvoiceWasPaid($invoice, $payment, $payment->company, Ninja::eventVars()));
-            $invoice->service()->workFlow();
         });
 
         return $payment->service()->applyNumber()->save();
diff --git a/app/PaymentDrivers/WePay/CreditCard.php b/app/PaymentDrivers/WePay/CreditCard.php
index 5cb3567976b0..8209c71c3546 100644
--- a/app/PaymentDrivers/WePay/CreditCard.php
+++ b/app/PaymentDrivers/WePay/CreditCard.php
@@ -60,12 +60,18 @@ use WePayCommon;
           'method' => '1',
          */
 
-		$response = $this->wepay_payment_driver->wepay->request('credit_card/authorize', array(
-		    'client_id'          => config('ninja.wepay.client_id'),
-		    'client_secret'      => config('ninja.wepay.client_secret'),
-		    'credit_card_id'     => (int)$data['credit_card_id'],
-		));
+        try {
+            
+    		$response = $this->wepay_payment_driver->wepay->request('credit_card/authorize', array(
+    		    'client_id'          => config('ninja.wepay.client_id'),
+    		    'client_secret'      => config('ninja.wepay.client_secret'),
+    		    'credit_card_id'     => (int)$data['credit_card_id'],
+    		));
 
+        }
+        catch(\Exception $e){
+            return $this->wepay_payment_driver->processInternallyFailedPayment($this->wepay_payment_driver, $e);
+        }
 		// display the response
         // nlog($response);
         
@@ -116,11 +122,16 @@ use WePayCommon;
         {
             nlog("authorize the card first!");
 
-            $response = $this->wepay_payment_driver->wepay->request('credit_card/authorize', array(
-                'client_id'          => config('ninja.wepay.client_id'),
-                'client_secret'      => config('ninja.wepay.client_secret'),
-                'credit_card_id'     => (int)$request->input('credit_card_id'),
-            ));
+            try {
+                $response = $this->wepay_payment_driver->wepay->request('credit_card/authorize', array(
+                    'client_id'          => config('ninja.wepay.client_id'),
+                    'client_secret'      => config('ninja.wepay.client_secret'),
+                    'credit_card_id'     => (int)$request->input('credit_card_id'),
+                ));
+            }
+            catch(\Exception $e){
+                return $this->wepay_payment_driver->processInternallyFailedPayment($this->wepay_payment_driver, $e);
+            }
 
             $credit_card_id = (int)$response->credit_card_id;
 
diff --git a/app/Services/Payment/UpdateInvoicePayment.php b/app/Services/Payment/UpdateInvoicePayment.php
index e344050cfa63..88aa81856818 100644
--- a/app/Services/Payment/UpdateInvoicePayment.php
+++ b/app/Services/Payment/UpdateInvoicePayment.php
@@ -83,6 +83,7 @@ class UpdateInvoicePayment
                 ->updatePaidToDate($paid_amount)
                 ->updateStatus()
                 ->deletePdf()
+                ->workFlow()
                 ->save();
 
             event(new InvoiceWasUpdated($invoice, $invoice->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));