diff --git a/public/scripts/extensions/stable-diffusion/index.js b/public/scripts/extensions/stable-diffusion/index.js
index 9a57bcd8e..b5c885c8c 100644
--- a/public/scripts/extensions/stable-diffusion/index.js
+++ b/public/scripts/extensions/stable-diffusion/index.js
@@ -1781,6 +1781,12 @@ async function generateMultimodalPrompt(generationType, quietPrompt) {
  */
 async function generatePrompt(quietPrompt) {
     const reply = await generateQuietPrompt(quietPrompt, false, false);
+
+    if (!reply) {
+        toastr.error('Prompt generation produced no text. Make sure you\'re using a valid instruct template and try again', 'Image Generation');
+        throw new Error('Prompt generation failed.');
+    }
+
     return processReply(reply);
 }
 
diff --git a/public/scripts/group-chats.js b/public/scripts/group-chats.js
index bb5773de1..c76d53f3f 100644
--- a/public/scripts/group-chats.js
+++ b/public/scripts/group-chats.js
@@ -627,6 +627,7 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
 
     const group = groups.find((x) => x.id === selected_group);
     let typingIndicator = $('#chat .typing_indicator');
+    let textResult = '';
 
     if (!group || !Array.isArray(group.members) || !group.members.length) {
         sendSystemMessage(system_message_types.EMPTY, '', { isSmallSys: true });
@@ -726,7 +727,7 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
 
             // Wait for generation to finish
             const generateFinished = await Generate(generateType, { automatic_trigger: by_auto_mode, ...(params || {}) });
-            await generateFinished;
+            textResult = await generateFinished;
         }
     } finally {
         typingIndicator.hide();
@@ -740,7 +741,7 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
         showSwipeButtons();
     }
 
-    return Promise.resolve();
+    return Promise.resolve(textResult);
 }
 
 function getLastMessageGenerationId() {