diff --git a/module/data/action/attackAction.mjs b/module/data/action/attackAction.mjs
index a2d47309..5e93d70b 100644
--- a/module/data/action/attackAction.mjs
+++ b/module/data/action/attackAction.mjs
@@ -51,7 +51,7 @@ export default class DHAttackAction extends DHDamageAction {
     async use(event, options) {
         const result = await super.use(event, options);
 
-        if (result.message?.system.action.roll?.type === 'attack') {
+        if (result?.message?.system.action.roll?.type === 'attack') {
             const { updateCountdowns } = game.system.api.applications.ui.DhCountdowns;
             await updateCountdowns(CONFIG.DH.GENERAL.countdownProgressionTypes.characterAttack.id);
         }
diff --git a/templates/settings/downtime-config/actions.hbs b/templates/settings/downtime-config/actions.hbs
index d197f983..feb05302 100644
--- a/templates/settings/downtime-config/actions.hbs
+++ b/templates/settings/downtime-config/actions.hbs
@@ -8,7 +8,7 @@
 
         <div class="settings-items">
             {{#each move.actions as |action|}}
-                {{> "systems/daggerheart/templates/settings/components/settings-item-line.hbs" id=action.id }}
+                {{> "systems/daggerheart/templates/settings/components/settings-item-line.hbs" id=action.id type="action" }}
             {{/each}}
         </div>
     </fieldset>