diff --git a/VERSION.txt b/VERSION.txt
index 6f3a0b275720..47c1ca8481b8 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.7.38
\ No newline at end of file
+5.7.39
\ No newline at end of file
diff --git a/app/DataMapper/Tax/BaseRule.php b/app/DataMapper/Tax/BaseRule.php
index 18886623261a..acb16f0e95c7 100644
--- a/app/DataMapper/Tax/BaseRule.php
+++ b/app/DataMapper/Tax/BaseRule.php
@@ -216,7 +216,12 @@ class BaseRule implements RuleInterface
             $this->invoice->tax_data = $tax_data;
             
             if(\DB::transactionLevel() == 0) {
-                $this->invoice->saveQuietly();
+
+                try {
+                    $this->invoice->saveQuietly();
+                }catch(\Exception $e) {
+                }
+                
             }
         }
             
diff --git a/config/ninja.php b/config/ninja.php
index 8f153dc66225..af465af6f99c 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -15,8 +15,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION','5.7.38'),
-    'app_tag' => env('APP_TAG','5.7.38'),
+    'app_version' => env('APP_VERSION','5.7.39'),
+    'app_tag' => env('APP_TAG','5.7.39'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),
diff --git a/openapi/api-docs.yaml b/openapi/api-docs.yaml
index 600f56788af9..ef6b3ef4bcab 100644
--- a/openapi/api-docs.yaml
+++ b/openapi/api-docs.yaml
@@ -3164,8 +3164,8 @@ paths:
     post:
       tags:
         - expenses
-      summary: "Adds a client"
-      description: "Adds an client to a company"
+      summary: "Adds an expense"
+      description: "Adds a expense to a company"
       operationId: storeExpense
       parameters:
         - $ref: "#/components/parameters/X-API-TOKEN"
@@ -3173,7 +3173,7 @@ paths:
         - $ref: "#/components/parameters/include"
       responses:
         200:
-          description: "Returns the saved client object"
+          description: "Returns the saved expense object"
           headers:
             X-MINIMUM-CLIENT-VERSION:
               $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@@ -3197,8 +3197,8 @@ paths:
     get:
       tags:
         - expenses
-      summary: "Shows a client"
-      description: "Displays a client by id"
+      summary: "Shows a expense"
+      description: "Displays a expense by id"
       operationId: showExpense
       parameters:
         - $ref: "#/components/parameters/X-API-TOKEN"
@@ -3237,8 +3237,8 @@ paths:
     put:
       tags:
         - expenses
-      summary: "Updates a client"
-      description: "Handles the updating of a client by id"
+      summary: "Updates a expense"
+      description: "Handles the updating of a expense by id"
       operationId: updateExpense
       parameters:
         - $ref: "#/components/parameters/X-API-TOKEN"
@@ -3254,7 +3254,7 @@ paths:
           example: D2J234DFA
       responses:
         200:
-          description: "Returns the client object"
+          description: "Returns the expense object"
           headers:
             X-MINIMUM-CLIENT-VERSION:
               $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@@ -3277,8 +3277,8 @@ paths:
     delete:
       tags:
         - expenses
-      summary: "Deletes a client"
-      description: "Handles the deletion of a client by id"
+      summary: "Deletes a expense"
+      description: "Handles the deletion of a expense by id"
       operationId: deleteExpense
       parameters:
         - $ref: "#/components/parameters/X-API-TOKEN"
@@ -3314,7 +3314,7 @@ paths:
     get:
       tags:
         - expenses
-      summary: "Shows a client for editting"
+      summary: "Shows a expense for editing"
       description: "Displays a client by id"
       operationId: editExpense
       parameters:
@@ -3331,7 +3331,7 @@ paths:
           example: D2J234DFA
       responses:
         200:
-          description: "Returns the client object"
+          description: "Returns the expense object"
           headers:
             X-MINIMUM-CLIENT-VERSION:
               $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@@ -3355,7 +3355,7 @@ paths:
     get:
       tags:
         - expenses
-      summary: "Gets a new blank client object"
+      summary: "Gets a new blank expense object"
       description: "Returns a blank object with default values"
       operationId: getExpensesCreate
       parameters:
@@ -3364,7 +3364,7 @@ paths:
         - $ref: "#/components/parameters/include"
       responses:
         200:
-          description: "A blank client object"
+          description: "A blank expense object"
           headers:
             X-MINIMUM-CLIENT-VERSION:
               $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@@ -4661,8 +4661,8 @@ paths:
     post:
       tags:
         - recurring_expenses
-      summary: "Adds a client"
-      description: "Adds an client to a company"
+      summary: "Adds a recurring expense"
+      description: "Adds a recurring expense to a company"
       operationId: storeRecurringExpense
       parameters:
         - $ref: "#/components/parameters/X-API-TOKEN"
@@ -4670,7 +4670,7 @@ paths:
         - $ref: "#/components/parameters/include"
       responses:
         200:
-          description: "Returns the saved client object"
+          description: "Returns the saved recurring expense object"
           headers:
             X-MINIMUM-CLIENT-VERSION:
               $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@@ -4694,8 +4694,8 @@ paths:
     get:
       tags:
         - recurring_expenses
-      summary: "Shows a client"
-      description: "Displays a client by id"
+      summary: "Shows a recurring expense"
+      description: "Displays a recurring expense by id"
       operationId: showRecurringExpense
       parameters:
         - $ref: "#/components/parameters/X-API-TOKEN"
@@ -4734,8 +4734,8 @@ paths:
     put:
       tags:
         - recurring_expenses
-      summary: "Updates a client"
-      description: "Handles the updating of a client by id"
+      summary: "Updates a recurring expense"
+      description: "Handles the updating of a recurring expense by id"
       operationId: updateRecurringExpense
       parameters:
         - $ref: "#/components/parameters/X-API-TOKEN"
@@ -4751,7 +4751,7 @@ paths:
           example: D2J234DFA
       responses:
         200:
-          description: "Returns the client object"
+          description: "Returns the recurring expense object"
           headers:
             X-MINIMUM-CLIENT-VERSION:
               $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@@ -4774,8 +4774,8 @@ paths:
     delete:
       tags:
         - recurring_expenses
-      summary: "Deletes a client"
-      description: "Handles the deletion of a client by id"
+      summary: "Deletes a recurring expense"
+      description: "Handles the deletion of a recurring expense by id"
       operationId: deleteRecurringExpense
       parameters:
         - $ref: "#/components/parameters/X-API-TOKEN"
@@ -4811,8 +4811,8 @@ paths:
     get:
       tags:
         - recurring_expenses
-      summary: "Shows a client for editting"
-      description: "Displays a client by id"
+      summary: "Shows a recurring expense for editting"
+      description: "Displays a recurring expense by id"
       operationId: editRecurringExpense
       parameters:
         - $ref: "#/components/parameters/X-API-TOKEN"
@@ -4828,7 +4828,7 @@ paths:
           example: D2J234DFA
       responses:
         200:
-          description: "Returns the client object"
+          description: "Returns the recurring expense object"
           headers:
             X-MINIMUM-CLIENT-VERSION:
               $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@@ -4852,7 +4852,7 @@ paths:
     get:
       tags:
         - recurring_expenses
-      summary: "Gets a new blank client object"
+      summary: "Gets a new blank recurring expense object"
       description: "Returns a blank object with default values"
       operationId: getRecurringExpensesCreate
       parameters:
@@ -4861,7 +4861,7 @@ paths:
         - $ref: "#/components/parameters/include"
       responses:
         200:
-          description: "A blank client object"
+          description: "A blank recurring expense object"
           headers:
             X-MINIMUM-CLIENT-VERSION:
               $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
diff --git a/openapi/paths.yaml b/openapi/paths.yaml
index 56d53f146b51..fe046713790d 100644
--- a/openapi/paths.yaml
+++ b/openapi/paths.yaml
@@ -3140,8 +3140,8 @@ paths:
     post:
       tags:
         - expenses
-      summary: "Adds a client"
-      description: "Adds an client to a company"
+      summary: "Adds an expense"
+      description: "Adds a expense to a company"
       operationId: storeExpense
       parameters:
         - $ref: "#/components/parameters/X-API-TOKEN"
@@ -3149,7 +3149,7 @@ paths:
         - $ref: "#/components/parameters/include"
       responses:
         200:
-          description: "Returns the saved client object"
+          description: "Returns the saved expense object"
           headers:
             X-MINIMUM-CLIENT-VERSION:
               $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@@ -3173,8 +3173,8 @@ paths:
     get:
       tags:
         - expenses
-      summary: "Shows a client"
-      description: "Displays a client by id"
+      summary: "Shows a expense"
+      description: "Displays a expense by id"
       operationId: showExpense
       parameters:
         - $ref: "#/components/parameters/X-API-TOKEN"
@@ -3213,8 +3213,8 @@ paths:
     put:
       tags:
         - expenses
-      summary: "Updates a client"
-      description: "Handles the updating of a client by id"
+      summary: "Updates a expense"
+      description: "Handles the updating of a expense by id"
       operationId: updateExpense
       parameters:
         - $ref: "#/components/parameters/X-API-TOKEN"
@@ -3230,7 +3230,7 @@ paths:
           example: D2J234DFA
       responses:
         200:
-          description: "Returns the client object"
+          description: "Returns the expense object"
           headers:
             X-MINIMUM-CLIENT-VERSION:
               $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@@ -3253,8 +3253,8 @@ paths:
     delete:
       tags:
         - expenses
-      summary: "Deletes a client"
-      description: "Handles the deletion of a client by id"
+      summary: "Deletes a expense"
+      description: "Handles the deletion of a expense by id"
       operationId: deleteExpense
       parameters:
         - $ref: "#/components/parameters/X-API-TOKEN"
@@ -3290,7 +3290,7 @@ paths:
     get:
       tags:
         - expenses
-      summary: "Shows a client for editting"
+      summary: "Shows a expense for editing"
       description: "Displays a client by id"
       operationId: editExpense
       parameters:
@@ -3307,7 +3307,7 @@ paths:
           example: D2J234DFA
       responses:
         200:
-          description: "Returns the client object"
+          description: "Returns the expense object"
           headers:
             X-MINIMUM-CLIENT-VERSION:
               $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@@ -3331,7 +3331,7 @@ paths:
     get:
       tags:
         - expenses
-      summary: "Gets a new blank client object"
+      summary: "Gets a new blank expense object"
       description: "Returns a blank object with default values"
       operationId: getExpensesCreate
       parameters:
@@ -3340,7 +3340,7 @@ paths:
         - $ref: "#/components/parameters/include"
       responses:
         200:
-          description: "A blank client object"
+          description: "A blank expense object"
           headers:
             X-MINIMUM-CLIENT-VERSION:
               $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@@ -4637,8 +4637,8 @@ paths:
     post:
       tags:
         - recurring_expenses
-      summary: "Adds a client"
-      description: "Adds an client to a company"
+      summary: "Adds a recurring expense"
+      description: "Adds a recurring expense to a company"
       operationId: storeRecurringExpense
       parameters:
         - $ref: "#/components/parameters/X-API-TOKEN"
@@ -4646,7 +4646,7 @@ paths:
         - $ref: "#/components/parameters/include"
       responses:
         200:
-          description: "Returns the saved client object"
+          description: "Returns the saved recurring expense object"
           headers:
             X-MINIMUM-CLIENT-VERSION:
               $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@@ -4670,8 +4670,8 @@ paths:
     get:
       tags:
         - recurring_expenses
-      summary: "Shows a client"
-      description: "Displays a client by id"
+      summary: "Shows a recurring expense"
+      description: "Displays a recurring expense by id"
       operationId: showRecurringExpense
       parameters:
         - $ref: "#/components/parameters/X-API-TOKEN"
@@ -4710,8 +4710,8 @@ paths:
     put:
       tags:
         - recurring_expenses
-      summary: "Updates a client"
-      description: "Handles the updating of a client by id"
+      summary: "Updates a recurring expense"
+      description: "Handles the updating of a recurring expense by id"
       operationId: updateRecurringExpense
       parameters:
         - $ref: "#/components/parameters/X-API-TOKEN"
@@ -4727,7 +4727,7 @@ paths:
           example: D2J234DFA
       responses:
         200:
-          description: "Returns the client object"
+          description: "Returns the recurring expense object"
           headers:
             X-MINIMUM-CLIENT-VERSION:
               $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@@ -4750,8 +4750,8 @@ paths:
     delete:
       tags:
         - recurring_expenses
-      summary: "Deletes a client"
-      description: "Handles the deletion of a client by id"
+      summary: "Deletes a recurring expense"
+      description: "Handles the deletion of a recurring expense by id"
       operationId: deleteRecurringExpense
       parameters:
         - $ref: "#/components/parameters/X-API-TOKEN"
@@ -4787,8 +4787,8 @@ paths:
     get:
       tags:
         - recurring_expenses
-      summary: "Shows a client for editting"
-      description: "Displays a client by id"
+      summary: "Shows a recurring expense for editting"
+      description: "Displays a recurring expense by id"
       operationId: editRecurringExpense
       parameters:
         - $ref: "#/components/parameters/X-API-TOKEN"
@@ -4804,7 +4804,7 @@ paths:
           example: D2J234DFA
       responses:
         200:
-          description: "Returns the client object"
+          description: "Returns the recurring expense object"
           headers:
             X-MINIMUM-CLIENT-VERSION:
               $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@@ -4828,7 +4828,7 @@ paths:
     get:
       tags:
         - recurring_expenses
-      summary: "Gets a new blank client object"
+      summary: "Gets a new blank recurring expense object"
       description: "Returns a blank object with default values"
       operationId: getRecurringExpensesCreate
       parameters:
@@ -4837,7 +4837,7 @@ paths:
         - $ref: "#/components/parameters/include"
       responses:
         200:
-          description: "A blank client object"
+          description: "A blank recurring expense object"
           headers:
             X-MINIMUM-CLIENT-VERSION:
               $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"