diff --git a/api/server/routes/endpoints.js b/api/server/routes/endpoints.js
index 70ce661428..bd23d52a4a 100644
--- a/api/server/routes/endpoints.js
+++ b/api/server/routes/endpoints.js
@@ -23,9 +23,9 @@ router.get('/', function (req, res) {
     : false;
   const chatGPTBrowser = process.env.CHATGPT_TOKEN
     ? {
-        userProvide: process.env.CHATGPT_TOKEN == 'user_provide',
-        availableModels: getChatGPTBrowserModels()
-      }
+      userProvide: process.env.CHATGPT_TOKEN == 'user_provide',
+      availableModels: getChatGPTBrowserModels()
+    }
     : false;
 
   res.send(JSON.stringify({ azureOpenAI, openAI, bingAI, chatGPTBrowser }));
diff --git a/api/server/routes/tokenizer.js b/api/server/routes/tokenizer.js
index 9e3007cbad..bab1c625e2 100644
--- a/api/server/routes/tokenizer.js
+++ b/api/server/routes/tokenizer.js
@@ -6,13 +6,21 @@ const registry = require('@dqbd/tiktoken/registry.json');
 const models = require('@dqbd/tiktoken/model_to_encoding.json');
 
 router.post('/', async (req, res) => {
-  const { arg } = req.body;
-  // console.log(typeof req.body === 'object' ? { ...req.body, ...req.query } : req.query);
-  const model = await load(registry[models['gpt-3.5-turbo']]);
-  const encoder = new Tiktoken(model.bpe_ranks, model.special_tokens, model.pat_str);
-  const tokens = encoder.encode(arg.text);
-  encoder.free();
-  res.send({ count: tokens.length });
+  try {
+    const { arg } = req.body;
+
+    console.log('context:', arg, req.body);
+
+    // console.log(typeof req.body === 'object' ? { ...req.body, ...req.query } : req.query);
+    const model = await load(registry[models['gpt-3.5-turbo']]);
+    const encoder = new Tiktoken(model.bpe_ranks, model.special_tokens, model.pat_str);
+    const tokens = encoder.encode(arg.text);
+    encoder.free();
+    res.send({ count: tokens.length });
+  } catch (e) {
+    console.error(e);
+    res.status(500).send(e.message);
+  }
 });
 
 module.exports = router;
diff --git a/client/src/components/Input/SetTokenDialog/index.jsx b/client/src/components/Input/SetTokenDialog/index.jsx
index 5dd1341e29..4e62649e73 100644
--- a/client/src/components/Input/SetTokenDialog/index.jsx
+++ b/client/src/components/Input/SetTokenDialog/index.jsx
@@ -84,7 +84,7 @@ const SetTokenDialog = ({ open, onOpenChange, endpoint }) => {
               )}
             />
             <small className="text-red-600">
-              Your token will be send to the server, but we won't save it.
+              Your token will be sent to the server, but not saved.
             </small>
             {helpText?.[endpoint]}
           </div>
diff --git a/client/src/data-provider/data-service.ts b/client/src/data-provider/data-service.ts
index 3a8a6a4ab6..f4d532e7bc 100644
--- a/client/src/data-provider/data-service.ts
+++ b/client/src/data-provider/data-service.ts
@@ -66,5 +66,5 @@ export const getAIEndpoints = () => {
 }
 
 export const updateTokenCount = (text: string) => { 
-  return request.post(endpoints.tokenizer(), {arg: {text}});
+  return request.post(endpoints.tokenizer(), {arg: text});
 }
\ No newline at end of file