diff --git a/app/Http/Requests/Activity/StoreNoteRequest.php b/app/Http/Requests/Activity/StoreNoteRequest.php
index 88e90a45f306..8233cfd0592c 100644
--- a/app/Http/Requests/Activity/StoreNoteRequest.php
+++ b/app/Http/Requests/Activity/StoreNoteRequest.php
@@ -33,9 +33,9 @@ class StoreNoteRequest extends Request
         $user = auth()->user();
 
         $rules = [
-            'entity' => 'required|in:invoices,quotes,credits,recurring_invoices,clients,vendors,credits,payments,projects,tasks,expenses,recurring_expenses,bank_transactions,purchase_orders',
+            'entity' => 'required|bail|in:invoices,quotes,credits,recurring_invoices,clients,vendors,credits,payments,projects,tasks,expenses,recurring_expenses,bank_transactions,purchase_orders',
             'entity_id' => ['required','bail', Rule::exists($this->entity, 'id')->where('company_id', $user->company()->id)],
-            'notes' => 'required',
+            'notes' => 'required|bail',
         ];
 
         return $rules;
@@ -68,6 +68,9 @@ class StoreNoteRequest extends Request
 
     public function getEntity()
     {
+        if(!$this->entity)
+            return false;
+
         $class = "\\App\\Models\\".ucfirst(Str::camel(rtrim($this->entity, 's')));
         return $class::withTrashed()->find(is_string($this->entity_id) ? $this->decodePrimaryKey($this->entity_id) :  $this->entity_id);
 
diff --git a/app/Import/Transformer/Csv/ClientTransformer.php b/app/Import/Transformer/Csv/ClientTransformer.php
index 3599c9edf06b..287b6ab2e049 100644
--- a/app/Import/Transformer/Csv/ClientTransformer.php
+++ b/app/Import/Transformer/Csv/ClientTransformer.php
@@ -70,16 +70,18 @@ class ClientTransformer extends BaseTransformer
             'custom_value2' => $this->getString($data, 'client.custom_value2'),
             'custom_value3' => $this->getString($data, 'client.custom_value3'),
             'custom_value4' => $this->getString($data, 'client.custom_value4'),
-            'balance' => preg_replace(
-                '/[^0-9,.]+/',
-                '',
-                $this->getFloat($data, 'client.balance')
-            ),
-            'paid_to_date' => preg_replace(
-                '/[^0-9,.]+/',
-                '',
-                $this->getFloat($data, 'client.paid_to_date')
-            ),
+            // 'balance' => preg_replace(
+            //     '/[^0-9,.]+/',
+            //     '',
+            //     $this->getFloat($data, 'client.balance')
+            // ),
+            // 'paid_to_date' => preg_replace(
+            //     '/[^0-9,.]+/',
+            //     '',
+            //     $this->getFloat($data, 'client.paid_to_date')
+            // ),
+            'paid_to_date' => 0,
+            'balance' => 0,
             'credit_balance' => 0,
             'settings' => $settings,
             'client_hash' => Str::random(40),