@@ -1033,7 +1033,11 @@ export async function restoreFormFromAutosave(autosaveFilename?: string): Promis
     }
 
     const templateData = templateNote.content || ''
-    const { _, frontmatterAttributes } = await DataStore.invokePluginCommandByName('renderFrontmatter', 'np.Templating', [templateData])
+    const { frontmatterBody, frontmatterAttributes } = await DataStore.invokePluginCommandByName('renderFrontmatter', 'np.Templating', [templateData])
+    if (frontmatterBody == null) {
+      logDebug(pluginJson, 'restoreFormFromAutosave: renderFrontmatter returned null (user likely cancelled); not opening form')
+      return
+    }
 
     // Add form fields, template info, and default values
     frontmatterAttributes.formFields = formFields
 
@@ -949,6 +949,13 @@ async function processCreateNew(data: any, formFields: Array<Object>): Promise<F
     try {
       // Use templating plugin to render the title (it contains template tags like <%- Contact_Name %>)
       const renderedTitleResult = await DataStore.invokePluginCommandByName('render', 'np.Templating', [newNoteTitleToUse, templatingContext])
+      if (renderedTitleResult == null) {
+        logDebug(pluginJson, 'processCreateNew: render returned null for newNoteTitle (user likely cancelled); aborting')
+        return {
+          success: false,
+          formSubmissionError: 'Template rendering was cancelled.',
+        }
+      }
       if (renderedTitleResult && typeof renderedTitleResult === 'string') {
         renderedNewNoteTitle = renderedTitleResult
         logDebug(`processCreateNew: Rendered newNoteTitle from "${newNoteTitleToUse}" to "${renderedNewNoteTitle}"`)
@@ -1098,6 +1105,13 @@ async function processCreateNew(data: any, formFields: Array<Object>): Promise<F
   if (folderPath && typeof folderPath === 'string' && (folderPath.includes('<%') || folderPath.includes('${'))) {
     try {
       const renderedFolderResult = await DataStore.invokePluginCommandByName('render', 'np.Templating', [folderPath, templatingContext])
+      if (renderedFolderResult == null) {
+        logDebug(pluginJson, 'processCreateNew: render returned null for folder (user likely cancelled); aborting')
+        return {
+          success: false,
+          formSubmissionError: 'Template rendering was cancelled.',
+        }
+      }
       if (renderedFolderResult && typeof renderedFolderResult === 'string') {
         folderPath = renderedFolderResult
         logDebug(`processCreateNew: Rendered folder to "${folderPath}"`)
 
@@ -113,7 +113,13 @@ export async function checkAndProcessFolderAndNewNoteTitle(templateNote: TNote,
       // Don't pass the unrendered title - let templateNew extract it from rendered content
       const argsArray = [templateTitle, folderToUse === '/' ? '' : folderToUse, '', frontmatterAttributes]
       logDebug(`checkAndProcessFolderAndNewNoteTitle: invoking templateNew because theFolder:"${theFolder}" hasTitle:${hasTitle} with argsArray:${JSON.stringify(argsArray)}`)
-      await DataStore.invokePluginCommandByName('templateNew', 'np.Templating', argsArray)
+      const templateNewResult = await DataStore.invokePluginCommandByName('templateNew', 'np.Templating', argsArray)
+      if (templateNewResult == null || (typeof templateNewResult === 'string' && templateNewResult.length === 0)) {
+        logDebug(
+          `checkAndProcessFolderAndNewNoteTitle: templateNew returned no filename (user likely cancelled a prompt); not trashing empty note "${emptyNoteFilename}"`,
+        )
+        return true
+      }
       // move the empty note to the trash
       // await DataStore.moveNote(emptyNoteFilename, '@Trash')
       await DataStore.trashNote(emptyNoteFilename)
 
@@ -76,11 +76,16 @@ async function renderAndInsertTemplate(
 ): Promise<void> {
   // Render the template, using recommended decoupled method of invoking a different plugin
   const result = await DataStore.invokePluginCommandByName('renderTemplate', 'np.Templating', [templateTitle])
-  // TEST: turning off error message for now, as it fires on Templates that only do background work.
-  // if (result == null || result === '') {
-  //   throw new Error(`No result from running Template '${templateTitle}'. Stopping.`)
-  // }
-  
+  // np.Templating: user may cancel a prompt — then **null** (see 2.4.5+). Do not insert.
+  if (result == null) {
+    logDebug(commandName, `renderTemplate returned null (user likely cancelled); not inserting for "${templateTitle}"`)
+    return
+  }
+  if (typeof result !== 'string') {
+    logDebug(commandName, `renderTemplate returned non-string (${typeof result}); not inserting for "${templateTitle}"`)
+    return
+  }
+
   // Work out where to insert it in the note, by reading the template, and checking
   // the frontmatter attributes for a 'location' field (append/insert/cursor)
   const attrs = getAttributes(templateData, true)
 
@@ -48,6 +48,10 @@ export async function insertNoteTemplate(origFileName: string, dailyNoteDate: Da
 
   logDebug(pluginJson, 'calling renderFrontmatter() to pre-render template')
   const { frontmatterBody: templateBody, frontmatterAttributes } = await DataStore.invokePluginCommandByName('renderFrontmatter', 'np.Templating', [templateContent])
+  if (templateBody == null) {
+    logDebug(pluginJson, `insertNoteTemplate: renderFrontmatter returned null (prompt cancelled); aborting`)
+    return
+  }
   if (Editor.type !== 'Calendar') {
     // Check if the template wants the note to be created in a folder (or with a new title) and if so, move the empty note to the trash and create a new note in the folder
     logDebug(pluginJson, `insertNoteTemplate: about to checkAndProcessFolderAndNewNoteTitle`)
@@ -56,6 +60,10 @@ export async function insertNoteTemplate(origFileName: string, dailyNoteDate: Da
   logDebug(pluginJson, `render() template with frontmatterAttributes: [${Object.keys(frontmatterAttributes).join(', ')}]`)
 
   const result = await DataStore.invokePluginCommandByName('render', 'np.Templating', [templateBody, frontmatterAttributes])
+  if (result == null) {
+    logDebug(pluginJson, `insertNoteTemplate: render returned null (user likely cancelled a prompt); not modifying editor or calendar note`)
+    return
+  }
 
   if (dailyNoteDate) {
     logDebug(pluginJson, `apply rendered template to daily note with date ${String(dailyNoteDate)}`)
@@ -202,6 +210,11 @@ async function renderTemplateForEvent(selectedEvent, templateFilename): Object {
   )
   const { frontmatterBody, frontmatterAttributes } = await DataStore.invokePluginCommandByName('renderFrontmatter', 'np.Templating', [templateContent, templateVariables])
 
+  if (frontmatterBody == null) {
+    logDebug(pluginJson, `${timer(scriptLoad)} - renderTemplateForEvent: renderFrontmatter returned null (prompt cancelled)`)
+    return { result: null, attrs: frontmatterAttributes }
+  }
+
   clo(frontmatterBody, 'renderTemplateForEvent frontmatterBody:')
   clo(frontmatterAttributes, 'renderTemplateForEvent frontmatterAttributes:')
 
@@ -345,6 +358,10 @@ export async function newMeetingNote(_selectedEvent?: TCalendarItem, _templateFi
   const { selectedEvent, templateFilename } = await selectEventAndTemplate(_selectedEvent, _templateFilename)
   logDebug(pluginJson, `${timer(scriptLoad)} - newMeetingNote: got selectedEvent and templateFilename; calling renderTemplateForEvent()`)
   const { result, attrs } = await renderTemplateForEvent(selectedEvent, templateFilename)
+  if (result == null) {
+    logDebug(pluginJson, `${timer(scriptLoad)} - newMeetingNote: render cancelled (null result); not creating note`)
+    return
+  }
   logDebug(pluginJson, `${timer(scriptLoad)} - newMeetingNote: rendered template`)
   clo(result, 'rendered template:')
   await createNoteAndLinkEvent(selectedEvent, result, attrs, forceNewNote)
 
@@ -6,6 +6,38 @@ See Plugin [Documentation](https://noteplan.co/templates/docs) for details on av
 
 DBW: REMEMBER THAT IF YOU ADDED ANY HELPERS IMPORTS, ADD THEM TO THE HELPER MODULE TO GIVE SCRIPTS ACCESS TO THEM ALSO
 
+## [2.4.5] 2026-05-17 @dwertheimer
+
+### Fixed
+
+- **Prompt cancel aborts the whole template run:** When the user cancels a Command Bar prompt (including **batched** `showForm`), `render` / `renderFrontmatter` processing now returns **`null`** instead of an empty string. **`templateNew`** and related commands stop before `DataStore.newNote`; **`checkAndProcessFolderAndNewNoteTitle`** does not trash the empty starter note when **`templateNew`** returns no filename. **`insertNoteTemplate`** (Meeting Notes) and **Forms** `processCreateNew` bail out when **`render`** is cancelled.
+
+### Changed
+
+- **API:** `NPTemplating.render`, exported `render` / `renderTemplate`, and Template Runner `renderTemplate` may resolve to **`null`** on user cancel (callers should treat **`null`** as abort, distinct from **`''`**).
+
+### Edited in this release
+
+- `np.Templating/lib/rendering/templateProcessor.js`, `np.Templating/lib/NPTemplating.js`, `np.Templating/src/Templating.js`, `np.Templating/src/NPTemplateRunner.js`
+- `helpers/NPEditor.js`, `np.MeetingNotes/src/NPMeetingNotes.js`, `dwertheimer.Forms/src/formSubmission.js`
+- `np.Templating/__tests__/prompt-cancellation.test.js`
+- `np.Templating/CHANGELOG.md`, `np.Templating/plugin.json` — version **2.4.5**
+
+## [2.4.4] 2026-05-17 @dwertheimer
+
+### Fixed
+
+- **Command Bar batched `prompt('Question?', […])` fields:** `parseParameters` treats the question as `varName` and the choice list as `promptMessage`, so `showForm` used **Answer** for `title`/`label`. Batch field labels now take the first quoted argument when `promptMessage` is an array or when it equals the comma-joined choice list (the same mis-parse as a string). The first-argument scanner reads quoted strings properly so labels include apostrophes inside double-quoted text (e.g. `"What's the priority?"`) and commas inside the question.
+
+### Added
+
+- **Tests (`promptFormBatch.test.js`):** Batched form labels for `prompt(varName, 'Message?', […])`, double-quoted questions, `<%` execution tags, **apostrophes inside `"…"`**, and **commas inside the question** string.
+
+### Edited in this release
+
+- `np.Templating/lib/support/modules/prompts/promptFormBatch.js`, `np.Templating/__tests__/promptFormBatch.test.js`
+- `np.Templating/CHANGELOG.md`, `np.Templating/plugin.json` — version **2.4.4**
+
 ## [2.4.3] 2026-05-14 @dwertheimer
 
 ### Fixed
 
@@ -34,7 +34,7 @@ describe('Prompt Cancellation Tests', () => {
       <%- var3 %>
     `
     const result = await NPTemplating.render(template)
-    expect(result).toBe('')
+    expect(result).toBeNull()
   })
 
   test('should stop template rendering when a prompt is cancelled', async () => {
@@ -44,7 +44,7 @@ describe('Prompt Cancellation Tests', () => {
       <%- var3 %>
     `
     const result = await NPTemplating.render(template)
-    expect(result).toBe('')
+    expect(result).toBeNull()
   })
 
   test('should handle frontmatter prompts cancellation', async () => {
@@ -56,7 +56,7 @@ var2: <%- var2 %>
 Content here
     `
     const result = await NPTemplating.render(template)
-    expect(result).toBe('')
+    expect(result).toBeNull()
   })
 
   test('should handle mixed prompt types cancellation', async () => {
@@ -68,6 +68,6 @@ var1: <%- prompt('var1', 'This prompt will be cancelled') %>
 <%- prompt('var3', 'This prompt will be cancelled') %>
     `
     const result = await NPTemplating.render(template)
-    expect(result).toBe('')
+    expect(result).toBeNull()
   })
 })
@@ -115,6 +115,106 @@ describe('prompt form batch (CommandBar.showForm)', () => {
     expect(result.sessionData.city).toBe('Chicago')
   })
 
+  test('batched prompt(question, [choices]) uses the question as showForm label (not Answer)', async () => {
+    global.CommandBar.showForm.mockResolvedValue({
+      submitted: true,
+      values: { Abstände_Review: '1w', Priority_prompt: 'A' },
+    })
+
+    const template =
+      "<%- prompt('Abstände Review?',['1w','2w']) %>" + "<%- prompt('Priority prompt?',['A','B']) %>"
+
+    const result = await processPrompts(template, {})
+    expect(result).not.toBe(false)
+    if (result === false) return
+    expect(global.CommandBar.showForm).toHaveBeenCalledTimes(1)
+    const formArg = global.CommandBar.showForm.mock.calls[0][0]
+    expect(formArg.fields[0].title).toBe('Abstände Review?')
+    expect(formArg.fields[0].label).toBe('Abstände Review?')
+    expect(formArg.fields[1].title).toBe('Priority prompt?')
+    expect(formArg.fields[1].label).toBe('Priority prompt?')
+  })
+
+  test('batched prompt(varName, message, [choices]) uses message as showForm label (not varName)', async () => {
+    global.CommandBar.showForm.mockResolvedValue({
+      submitted: true,
+      values: { pick: 'A', Rhythm: '1w' },
+    })
+
+    const template =
+      "<%- prompt('pick', 'Pick one?', ['A','B']) %>" + "<%- prompt('Rhythm?', ['1w','2w']) %>"
+    const result = await processPrompts(template, {})
+    expect(result).not.toBe(false)
+    if (result === false) return
+    const formArg = global.CommandBar.showForm.mock.calls[0][0]
+    expect(formArg.fields[0].title).toBe('Pick one?')
+    expect(formArg.fields[0].label).toBe('Pick one?')
+    expect(formArg.fields[1].title).toBe('Rhythm?')
+  })
+
+  test('batched prompt with double-quoted question uses that string as label', async () => {
+    global.CommandBar.showForm.mockResolvedValue({
+      submitted: true,
+      values: { Double_quoted: 'a', pick: 'B' },
+    })
+
+    const template = '<%- prompt("Double quoted?", ["a","b"]) %>' + "<%- prompt('pick', 'Second?', ['B','C']) %>"
+    const result = await processPrompts(template, {})
+    expect(result).not.toBe(false)
+    if (result === false) return
+    const formArg = global.CommandBar.showForm.mock.calls[0][0]
+    expect(formArg.fields[0].title).toBe('Double quoted?')
+    expect(formArg.fields[1].title).toBe('Second?')
+  })
+
+  test('batched <% execution %> prompt(question, [choices]) labels match <%- output %> form', async () => {
+    global.CommandBar.showForm.mockResolvedValue({
+      submitted: true,
+      values: { Q: 'a', Y: 'c' },
+    })
+
+    const template = "<% prompt('Q?', ['a','b']) %><% prompt('Y?', ['c','d']) %>"
+    const result = await processPrompts(template, {})
+    expect(result).not.toBe(false)
+    if (result === false) return
+    const formArg = global.CommandBar.showForm.mock.calls[0][0]
+    expect(formArg.fields[0].title).toBe('Q?')
+    expect(formArg.fields[1].title).toBe('Y?')
+  })
+
+  test('batched prompt("What\'s the priority?", […]) uses full question as label (apostrophe inside double quotes)', async () => {
+    global.CommandBar.showForm.mockResolvedValue({
+      submitted: true,
+      values: { What_s_the_priority: 'a', Other: 'c' },
+    })
+
+    const template =
+      `<%- prompt("What's the priority?", ['a','b']) %>` + "<%- prompt('Other?', ['c','d']) %>"
+    const result = await processPrompts(template, {})
+    expect(result).not.toBe(false)
+    if (result === false) return
+    const formArg = global.CommandBar.showForm.mock.calls[0][0]
+    expect(formArg.fields[0].title).toBe("What's the priority?")
+    expect(formArg.fields[0].label).toBe("What's the priority?")
+    expect(formArg.fields[1].title).toBe('Other?')
+  })
+
+  test('batched prompt(\'Comma, in, question?\', […]) uses full first argument as label', async () => {
+    global.CommandBar.showForm.mockResolvedValue({
+      submitted: true,
+      values: { One_two_three: 'a', Z: 'x' },
+    })
+
+    const template =
+      "<%- prompt('One, two, three?', ['a','b']) %>" + "<%- prompt('Z?', ['x','y']) %>"
+    const result = await processPrompts(template, {})
+    expect(result).not.toBe(false)
+    if (result === false) return
+    const formArg = global.CommandBar.showForm.mock.calls[0][0]
+    expect(formArg.fields[0].title).toBe('One, two, three?')
+    expect(formArg.fields[1].title).toBe('Z?')
+  })
+
   test('non-prompt tag between prompts breaks contiguity — no showForm', async () => {
     global.CommandBar.showForm.mockResolvedValue({
       submitted: true,
 
@@ -202,9 +202,9 @@ class NPTemplating {
    * @param {string} inputTemplateData - The template content to render
    * @param {any} [userData={}] - User data to use in template rendering
    * @param {any} [userOptions={}] - Options for template rendering
-   * @returns {Promise<string>} A promise that resolves to the rendered template content
+   * @returns {Promise<string | null>} Rendered template, or **null** if the user cancels a prompt
    */
-  static async render(inputTemplateData: string, userData: any = {}, userOptions: any = {}): Promise<string> {
+  static async render(inputTemplateData: string, userData: any = {}, userOptions: any = {}): Promise<string | null> {
     try {
       await this.setup()
       return render(inputTemplateData, userData, userOptions, this.templateConfig)
@@ -221,9 +221,9 @@ class NPTemplating {
    * @param {string} [templateName=''] - The name of the template to render
    * @param {any} [userData={}] - User data to use in template rendering
    * @param {any} [userOptions={}] - Options for template rendering
-   * @returns {Promise<string>} A promise that resolves to the rendered template content
+   * @returns {Promise<string | null>}
    */
-  static async renderTemplate(templateName: string = '', userData: any = {}, userOptions: any = {}): Promise<string> {
+  static async renderTemplate(templateName: string = '', userData: any = {}, userOptions: any = {}): Promise<string | null> {
     try {
       await this.setup()
       return renderTemplateByName(templateName, userData, userOptions)