diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts
index 4dcc2112..0e51def0 100644
--- a/packages/core.gbapp/services/GBDeployer.ts
+++ b/packages/core.gbapp/services/GBDeployer.ts
@@ -316,7 +316,7 @@ export class GBDeployer implements IGBDeployer {
           
     const azureOpenAIKey = await min.core.getParam(min.instance, 'Azure Open AI Key', null);
     const azureOpenAIVersion = await min.core.getParam(min.instance, 'Azure Open AI Version', null);
-    const azureOpenAIApiInstanceName = await min.core.getParam(min.instance, 'Azure Open AI Instance Name', null);
+    const azureOpenAIApiInstanceName = await min.core.getParam(min.instance, 'Azure Open AI Instance', null);
     const azureOpenAIDeployment = await min.core.getParam(min.instance, 'Azure Open AI Deployment', null);
 
     let embedding;
diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts
index 945546ac..a926e654 100644
--- a/packages/core.gbapp/services/GBMinService.ts
+++ b/packages/core.gbapp/services/GBMinService.ts
@@ -785,7 +785,7 @@ export class GBMinService {
     min.sandBoxMap = {};
     min['scheduleMap'] = {};
     min['conversationWelcomed'] = {};
-    if (await min.core.getParam(min.instance, 'Azure Open AI Instance Name', null)) {
+    if (await min.core.getParam(min.instance, 'Azure Open AI Instance', null)) {
       const gbkbPath = DialogKeywords.getGBAIPath(min.botId, 'gbkb');
       min['vectorStorePath'] = Path.join('work', gbkbPath, 'docs-vectorized');
       min['vectorStore'] = await this.deployer.loadOrCreateEmptyVectorStore(min);
diff --git a/packages/gpt.gblib/services/ChatServices.ts b/packages/gpt.gblib/services/ChatServices.ts
index db55de60..2f504348 100644
--- a/packages/gpt.gblib/services/ChatServices.ts
+++ b/packages/gpt.gblib/services/ChatServices.ts
@@ -184,7 +184,8 @@ export class ChatServices {
     sanitizedQuestion: string,
     numDocuments: number = 100
   ): Promise<string> {
-    if (sanitizedQuestion === '') {
+    
+    if (sanitizedQuestion === '' || !vectorStore) {
       return '';
     }