diff --git a/pom.xml b/pom.xml
index e273797..c8bd701 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.artillexstudios</groupId>
     <artifactId>AxGraves</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0</version>
     <packaging>jar</packaging>
 
     <name>AxGraves</name>
@@ -106,7 +106,7 @@
         <dependency>
             <groupId>com.artillexstudios.axapi</groupId>
             <artifactId>axapi</artifactId>
-            <version>1.4.403</version>
+            <version>1.4.435</version>
             <scope>compile</scope>
             <classifier>all</classifier>
         </dependency>
diff --git a/src/main/java/com/artillexstudios/axgraves/AxGraves.java b/src/main/java/com/artillexstudios/axgraves/AxGraves.java
index bc49fd5..e6775f9 100644
--- a/src/main/java/com/artillexstudios/axgraves/AxGraves.java
+++ b/src/main/java/com/artillexstudios/axgraves/AxGraves.java
@@ -7,8 +7,8 @@
 import com.artillexstudios.axapi.libs.boostedyaml.boostedyaml.settings.general.GeneralSettings;
 import com.artillexstudios.axapi.libs.boostedyaml.boostedyaml.settings.loader.LoaderSettings;
 import com.artillexstudios.axapi.libs.boostedyaml.boostedyaml.settings.updater.UpdaterSettings;
-import com.artillexstudios.axapi.utils.FeatureFlags;
 import com.artillexstudios.axapi.utils.MessageUtils;
+import com.artillexstudios.axapi.utils.featureflags.FeatureFlags;
 import com.artillexstudios.axgraves.commands.Commands;
 import com.artillexstudios.axgraves.grave.Grave;
 import com.artillexstudios.axgraves.grave.SpawnedGraves;
@@ -68,8 +68,11 @@ public void disable() {
         for (Grave grave : SpawnedGraves.getGraves()) {
             if (!CONFIG.getBoolean("save-graves.enabled", true))
                 grave.remove();
-            grave.getEntity().remove();
-            grave.getHologram().remove();
+
+            if (grave.getEntity() != null)
+                grave.getEntity().remove();
+            if (grave.getHologram() != null)
+                grave.getHologram().remove();
         }
 
         if (CONFIG.getBoolean("save-graves.enabled", true))
@@ -78,9 +81,9 @@ public void disable() {
         EXECUTOR.shutdown();
     }
 
-    public void updateFlags() {
-        FeatureFlags.USE_LEGACY_HEX_FORMATTER.set(true);
-        FeatureFlags.PACKET_ENTITY_TRACKER_ENABLED.set(true);
-        FeatureFlags.HOLOGRAM_UPDATE_TICKS.set(5L);
+    public void updateFlags(FeatureFlags flags) {
+        flags.USE_LEGACY_HEX_FORMATTER.set(true);
+        flags.PACKET_ENTITY_TRACKER_ENABLED.set(true);
+        flags.HOLOGRAM_UPDATE_TICKS.set(5L);
     }
 }