From c846c5bc85af8af14d49f284c9bc082b061fb1f2 Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Sat, 6 Dec 2025 23:06:31 +0100
Subject: [PATCH] . (#1373)

---
 module/applications/dialogs/d20RollDialog.mjs |  4 +--
 templates/dialogs/dice-roll/rollSelection.hbs | 25 +++++++++++--------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/module/applications/dialogs/d20RollDialog.mjs b/module/applications/dialogs/d20RollDialog.mjs
index f46125d8..b28a3ffb 100644
--- a/module/applications/dialogs/d20RollDialog.mjs
+++ b/module/applications/dialogs/d20RollDialog.mjs
@@ -116,14 +116,14 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
             context.isLite = this.config.roll?.lite;
             context.extraFormula = this.config.extraFormula;
             context.formula = this.roll.constructFormula(this.config);
-            if (this.actor.system.traits) context.abilities = this.getTraitModifiers();
+            if (this.actor?.system?.traits) context.abilities = this.getTraitModifiers();
 
             context.showReaction = !this.config.roll?.type && context.rollType === 'DualityRoll';
             context.reactionOverride = this.reactionOverride;
         }
 
         const tagTeamSetting = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.TagTeamRoll);
-        if (tagTeamSetting.members[this.actor.id] && !this.config.skips?.createMessage) {
+        if (this.actor && tagTeamSetting.members[this.actor.id] && !this.config.skips?.createMessage) {
             context.activeTagTeamRoll = true;
             context.tagTeamSelected = this.config.tagTeamSelected;
         }
diff --git a/templates/dialogs/dice-roll/rollSelection.hbs b/templates/dialogs/dice-roll/rollSelection.hbs
index c13dc289..c7a9b0f9 100644
--- a/templates/dialogs/dice-roll/rollSelection.hbs
+++ b/templates/dialogs/dice-roll/rollSelection.hbs
@@ -70,17 +70,20 @@
                     {{/if}}
                 </div>
 
-                <fieldset class="experience-container">
-                    <legend>{{localize "DAGGERHEART.GENERAL.experience.plural"}}</legend>
-                    {{#each experiences}}
-                        {{#if name}}
-                            <div class="experience-chip {{#if (includes ../selectedExperiences id)}}selected{{/if}}" data-action="selectExperience" data-key="{{id}}" data-tooltip="{{this.description}}">
-                                <span><i class="{{ifThen (includes ../selectedExperiences id) "fa-solid" "fa-regular"}} fa-circle"></i></span>
-                                <span class="label">{{name}} +{{value}}</span>
-                            </div>
-                        {{/if}}
-                    {{/each}}
-                </fieldset>
+                {{#if experiences.length}}
+                    <fieldset class="experience-container">
+                        <legend>{{localize "DAGGERHEART.GENERAL.experience.plural"}}</legend>
+                        {{#each experiences}}
+                            {{#if name}}
+                                <div class="experience-chip {{#if (includes ../selectedExperiences id)}}selected{{/if}}" data-action="selectExperience" data-key="{{id}}" data-tooltip="{{this.description}}">
+                                    <span><i class="{{ifThen (includes ../selectedExperiences id) "fa-solid" "fa-regular"}} fa-circle"></i></span>
+                                    <span class="label">{{name}} +{{value}}</span>
+                                </div>
+                            {{/if}}
+                        {{/each}}
+                    </fieldset>
+                {{/if}}
+
                 <fieldset class="modifier-container {{#if (eq @root.rollType 'DualityRoll')}}two-columns{{else}}one-column{{/if}}">
                     <legend>{{localize "DAGGERHEART.GENERAL.Modifier.plural"}}</legend>
                     <div class="nest-inputs">