diff --git a/module/applications/sheets/items/class.mjs b/module/applications/sheets/items/class.mjs
index b88e6ca3..e7e00c42 100644
--- a/module/applications/sheets/items/class.mjs
+++ b/module/applications/sheets/items/class.mjs
@@ -203,10 +203,10 @@ export default class ClassSheet extends DHBaseItemSheet {
 
         if (target === 'subclasses') {
             const subclass = await foundry.utils.fromUuid(uuid);
-            await subclass.update({ 'system.linkedClass': null });
+            await subclass?.update({ 'system.linkedClass': null });
         }
 
-        await this.document.update({ [`system.${target}`]: prop.filter(i => i.uuid !== uuid).map(x => x.uuid) });
+        await this.document.update({ [`system.${target}`]: prop.filter(i => i && i.uuid !== uuid).map(x => x.uuid) });
     }
 
     /**
diff --git a/templates/sheets/items/class/features.hbs b/templates/sheets/items/class/features.hbs
index 6ed449dc..ef940730 100644
--- a/templates/sheets/items/class/features.hbs
+++ b/templates/sheets/items/class/features.hbs
@@ -50,7 +50,7 @@
                                     class='effect-control'
                                     data-action='removeItemFromCollection'
                                     data-target="subclasses"
-                                    data-uuid={{subclass.uuid}}
+                                    data-uuid="{{subclass.uuid}}"
                                     data-tooltip='{{localize "CONTROLS.CommonDelete"}}'
                                 >
                                     <i class='fas fa-trash'></i>