diff --git a/app/Http/Controllers/StripeConnectController.php b/app/Http/Controllers/StripeConnectController.php
index e6d12a02f852..b24743fafc89 100644
--- a/app/Http/Controllers/StripeConnectController.php
+++ b/app/Http/Controllers/StripeConnectController.php
@@ -32,7 +32,8 @@ class StripeConnectController extends BaseController
         // Should we check if company has set country in the ap? Otherwise this will fail.
 
         if(!is_array($request->getTokenContent()))
-            throw new \Exception('Invalid token');
+            abort(400, 'Invalid token');
+
 
         MultiDB::findAndSetDbByCompanyKey($request->getTokenContent()['company_key']);
 
@@ -55,7 +56,7 @@ class StripeConnectController extends BaseController
 
         $link = Account::link($account->id, $token);
 
-        $company_gateway = CompanyGatewayFactory::create($request->getCompany()->id, $request->getContact()->client->user->id);
+        $company_gateway = CompanyGatewayFactory::create($request->getCompany()->id, $request->getContact()->id);
 
         $company_gateway->fill([
             'gateway_key' => 'd14dd26a47cecc30fdd65700bfb67b34',
diff --git a/app/Http/Requests/StripeConnect/InitializeStripeConnectRequest.php b/app/Http/Requests/StripeConnect/InitializeStripeConnectRequest.php
index 0805aacd71b4..ca0bd52d201b 100644
--- a/app/Http/Requests/StripeConnect/InitializeStripeConnectRequest.php
+++ b/app/Http/Requests/StripeConnect/InitializeStripeConnectRequest.php
@@ -14,6 +14,7 @@ namespace App\Http\Requests\StripeConnect;
 
 use App\Models\ClientContact;
 use App\Models\Company;
+use App\Models\User;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Cache;
 
@@ -55,7 +56,7 @@ class InitializeStripeConnectRequest extends FormRequest
 
     public function getContact()
     {
-        return ClientContact::findOrFail($this->getTokenContent()['user_id']);
+        return User::findOrFail($this->getTokenContent()['user_id']);
     }
 
     public function getCompany()