diff --git a/public/scripts/world-info.js b/public/scripts/world-info.js
index 3fb0c6b22..61c455cec 100644
--- a/public/scripts/world-info.js
+++ b/public/scripts/world-info.js
@@ -371,9 +371,9 @@ async function saveWorldInfo(immediately) {
 
 async function renameWorldInfo() {
     const oldName = world_info;
-    const newName = $("#world_popup_name").val();
+    const newName = $("#world_popup_name").val().trim();
 
-    if (oldName === newName) {
+    if (oldName === newName || !newName) {
         return;
     }
 
diff --git a/server.js b/server.js
index 43e0c2f37..c0df4c220 100644
--- a/server.js
+++ b/server.js
@@ -2294,6 +2294,7 @@ app.post("/generate_openai", jsonParser, function (request, response_generate_op
                 response_generate_openai.send({ error: true, quota_error });
             } catch (error) {
                 console.error(error);
+                return response_generate_openai.send({ error: true });
             }
         });
 });