diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php
index 4c05a86bf22a..368a0522ba70 100644
--- a/app/Models/CompanyGateway.php
+++ b/app/Models/CompanyGateway.php
@@ -213,7 +213,7 @@ class CompanyGateway extends BaseModel
         if($this->gateway->provider == 'Stripe' && strpos($config->publishableKey, 'test'))
             return true;
 
-        if(property_exists($config, 'testMode') && $config->testMode)
+        if($config && property_exists($config, 'testMode') && $config->testMode)
             return true;
 
         return false;
diff --git a/app/Utils/SystemHealth.php b/app/Utils/SystemHealth.php
index 07aa4d698f03..d5b560f6cf8b 100644
--- a/app/Utils/SystemHealth.php
+++ b/app/Utils/SystemHealth.php
@@ -71,8 +71,8 @@ class SystemHealth
             'env_writable' => self::checkEnvWritable(),
             //'mail' => self::testMailServer(),
             'simple_db_check' => (bool) self::simpleDbCheck(),
-            'npm_status' => self::checkNpm(),
-            'node_status' => self::checkNode(),
+            //'npm_status' => self::checkNpm(),
+            //'node_status' => self::checkNode(),
         ];
     }