diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySpell.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySpell.java
index 6004d85761..57c411e126 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySpell.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySpell.java
@@ -28,6 +28,9 @@ public ElementTag getPropertyValue() {
 
     @Override
     public void setPropertyValue(ElementTag param, Mechanism mechanism) {
+        if (!mechanism.requireEnum(Spellcaster.Spell.class)) {
+            return;
+        }
         Spellcaster.Spell spell = param.asEnum(Spellcaster.Spell.class);
         if (object.isCitizensNPC()) {
             object.getDenizenNPC().getCitizen().getOrAddTrait(SpellcasterTrait.class).setSpell(spell);
diff --git a/v1_20/src/main/java/com/denizenscript/denizen/nms/v1_20/impl/network/handlers/DenizenNetworkManagerImpl.java b/v1_20/src/main/java/com/denizenscript/denizen/nms/v1_20/impl/network/handlers/DenizenNetworkManagerImpl.java
index f35334e0d7..f6732afce0 100644
--- a/v1_20/src/main/java/com/denizenscript/denizen/nms/v1_20/impl/network/handlers/DenizenNetworkManagerImpl.java
+++ b/v1_20/src/main/java/com/denizenscript/denizen/nms/v1_20/impl/network/handlers/DenizenNetworkManagerImpl.java
@@ -356,6 +356,9 @@ public void flushChannel() {
     }
 
     public Packet<ClientGamePacketListener> processPacketHandlersFor(Packet<ClientGamePacketListener> packet) {
+        if (packet == null) {
+            return null;
+        }
         List<PacketHandler<?>> packetHandlers = DenizenNetworkManagerImpl.packetHandlers.get(packet.getClass());
         if (packetHandlers != null) {
             for (PacketHandler<?> _packetHandler : packetHandlers) {