diff --git a/app/Factory/CompanyGatewayFactory.php b/app/Factory/CompanyGatewayFactory.php
index 3d0b383c12ca..8717c2578a04 100644
--- a/app/Factory/CompanyGatewayFactory.php
+++ b/app/Factory/CompanyGatewayFactory.php
@@ -23,6 +23,7 @@ class CompanyGatewayFactory
         $company_gateway->user_id = $user_id;
         $company_gateway->require_billing_address = false;
         $company_gateway->require_shipping_address = false;
+        $company_gateway->config = encrypt(json_encode(new \stdClass));
         // $company_gateway->fees_and_limits = new FeesAndLimits;
         
         return $company_gateway;
diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php
index 63c4d499e177..0622afbdd934 100644
--- a/app/Models/CompanyGateway.php
+++ b/app/Models/CompanyGateway.php
@@ -250,7 +250,7 @@ class CompanyGateway extends BaseModel
     {
         $config = $this->getConfig();
 
-        if ($this->gateway->provider == 'Stripe' && property_exists($config, 'publishableKey') && strpos($config->publishableKey, 'test')) {
+        if ($this->gateway && $this->gateway->provider == 'Stripe' && property_exists($config, 'publishableKey') && strpos($config->publishableKey, 'test')) {
             return true;
         }