diff --git a/module/applications/dialogs/d20RollDialog.mjs b/module/applications/dialogs/d20RollDialog.mjs
index 9a98b197..e9140b56 100644
--- a/module/applications/dialogs/d20RollDialog.mjs
+++ b/module/applications/dialogs/d20RollDialog.mjs
@@ -224,7 +224,8 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
         this.render();
     }
 
-    static async submitRoll() {
+    static async submitRoll(event) {
+        event.preventDefault();
         await this.close({ submitted: true });
     }
 
diff --git a/module/dice/d20Roll.mjs b/module/dice/d20Roll.mjs
index b1d3bd0b..1c1b32c3 100644
--- a/module/dice/d20Roll.mjs
+++ b/module/dice/d20Roll.mjs
@@ -101,7 +101,7 @@ export default class D20Roll extends DHRoll {
         this.options.roll.modifiers = this.applyBaseBonus();
 
         const actorExperiences = this.options.roll.companionRoll
-            ? (this.options.data?.companion?.system.experiences ?? {})
+            ? (this.options.data?.companion?.system?.experiences ?? {})
             : (this.options.data.system?.experiences ?? {});
         this.options.experiences?.forEach(m => {
             if (actorExperiences[m])