diff --git a/src/module/enrichers.js b/src/module/enrichers.js
index 2379351..d000f29 100644
--- a/src/module/enrichers.js
+++ b/src/module/enrichers.js
@@ -86,8 +86,8 @@ function swadeTraitRollEnricher(match, options) {
 
 function onSwadeRollLink(ev) {
   console.log('SWADE ROLL', ev);
-  const targetElement = ev.target;
-  if (!targetElement.closest('a.mb-swade-roll-link')) return;
+  const targetElement = ev.target.closest('a.mb-swade-roll-link');
+  if (!targetElement) return;
   ev.preventDefault();
   const rollType = targetElement.dataset.rollType;
   switch (rollType) {
@@ -106,8 +106,8 @@ function onRequestTraitRollLink(targetElement) {
     return;
   }
   const { traitType, traitName, modDesc, flavor } = targetElement.dataset;
-  const tn = parseInt(targetElement.dataset.tn);
-  const modVal = parseInt(targetElement.dataset.modVal);
+  const tn = parseInt(targetElement.dataset.tn ?? '4');
+  const modVal = parseInt(targetElement.dataset.modVal ?? '0');
   const options = { targetNumber: 4, flavor };
   if (tn != 4) {
     options.targetNumber = tn;
@@ -120,13 +120,14 @@ function onRequestTraitRollLink(targetElement) {
 
 function onDamageRollLink(targetElement) {
   const roll = targetElement.dataset.roll;
-  const ap = parseInt(targetElement.dataset.ap);
-  let flavor = targetElement.dataset.flavor;
+  const ap = parseInt(targetElement.dataset.ap ?? '0');
+  let flavor = targetElement.dataset.flavor ?? '';
   const options = {};
   if (ap > 0) {
     flavor = `${flavor ? flavor + ' - ' : ''}AP: ${ap}`;
     options.ap = ap;
   }
+  console.log('DamageRollLink', roll, ap, flavor, options);
   new CONFIG.Dice.DamageRoll(roll, null, options).toMessage({ flavor });
 }