diff --git a/build.gradle b/build.gradle
index 1e94a13..2c59f79 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ java {
 }
 
 group = 'me.playbosswar.com'
-version = '8.16.0'
+version = '8.16.1'
 description = 'CommandTimer'
 
 repositories {
@@ -74,7 +74,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'me.playbosswar.com'
             artifactId = 'commandtimer'
-            version = '8.16.0'
+            version = '8.16.1'
 
             from components.java
         }
diff --git a/java17-build.gradle b/java17-build.gradle
index 4b4190d..08edf23 100644
--- a/java17-build.gradle
+++ b/java17-build.gradle
@@ -10,7 +10,7 @@ java {
 
 
 group = 'me.playbosswar.com'
-version = '8.16.0'
+version = '8.16.1'
 description = 'CommandTimer'
 
 repositories {
@@ -63,7 +63,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'me.playbosswar.com'
             artifactId = 'commandtimer-java17'
-            version = '8.16.0'
+            version = '8.16.1'
 
             from components.java
         }
diff --git a/java21-build.gradle b/java21-build.gradle
index f0cebf7..4a1dcac 100644
--- a/java21-build.gradle
+++ b/java21-build.gradle
@@ -10,7 +10,7 @@ java {
 
 
 group = 'me.playbosswar.com'
-version = '8.16.0'
+version = '8.16.1'
 description = 'CommandTimer'
 
 repositories {
@@ -67,7 +67,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'me.playbosswar.com'
             artifactId = 'commandtimer-java21'
-            version = '8.16.0'
+            version = '8.16.1'
             from components.java
         }
     }
diff --git a/src/main/java/me/playbosswar/com/CommandTimerPlugin.java b/src/main/java/me/playbosswar/com/CommandTimerPlugin.java
index f588085..6a0468f 100644
--- a/src/main/java/me/playbosswar/com/CommandTimerPlugin.java
+++ b/src/main/java/me/playbosswar/com/CommandTimerPlugin.java
@@ -125,11 +125,15 @@ public void onEnable() {
 
     @Override
     public void onDisable() {
-        tasksManager.disable();
+        if(tasksManager != null) {
+            tasksManager.disable();
+        }
         if(adHocCommandsManager != null) {
             adHocCommandsManager.disable();
         }
-        conditionEngineManager.onDisable();
+        if(conditionEngineManager != null) {
+            conditionEngineManager.onDisable();
+        }
         saveDefaultConfig();
         plugin = null;
     }
diff --git a/src/main/java/me/playbosswar/com/tasks/Task.java b/src/main/java/me/playbosswar/com/tasks/Task.java
index 8b19f04..58c20e0 100644
--- a/src/main/java/me/playbosswar/com/tasks/Task.java
+++ b/src/main/java/me/playbosswar/com/tasks/Task.java
@@ -348,18 +348,12 @@ public void storeInstance() {
         transaction.setContext("task", json);
 
         try {
-            String path;
-            File existingFile = null;
-            try {
-                path = Files.getTaskFile(id);
-                existingFile = new File(path);
-            } catch (IllegalStateException e) {
-                path = Files.getNewTaskFile(id);
-            }
+            String path = Files.getTaskFile(id);
+            File existingFile = new File(path);
 
             JsonObject jsonObject = new JsonParser().parse(json).getAsJsonObject();
             
-            if (existingFile != null && existingFile.exists()) {
+            if (existingFile.exists()) {
                 try (FileReader fr = new FileReader(existingFile)) {
                     JsonObject existingJson = new JsonParser().parse(fr).getAsJsonObject();
                     if (existingJson.has("configVersion")) {
diff --git a/src/main/java/me/playbosswar/com/utils/Files.java b/src/main/java/me/playbosswar/com/utils/Files.java
index a7edd62..434a4ca 100644
--- a/src/main/java/me/playbosswar/com/utils/Files.java
+++ b/src/main/java/me/playbosswar/com/utils/Files.java
@@ -123,7 +123,7 @@ public static String getTaskFile(UUID id) {
         if (file != null) {
             return file.getAbsolutePath();
         }
-        throw new IllegalStateException("Task file not found for UUID: " + id);
+        return getNewTaskFile(id);
     }
 
     public static String getTaskLocalExecutionFile(UUID id) {
@@ -131,7 +131,7 @@ public static String getTaskLocalExecutionFile(UUID id) {
         if (file != null) {
             return file.getAbsolutePath();
         }
-        throw new IllegalStateException("Task metadata file not found for UUID: " + id);
+        return getNewTaskLocalExecutionFile(id);
     }
 
     public static String getNewTaskFile(UUID id) {
@@ -151,7 +151,7 @@ public static String getAdHocCommandFile(UUID id) {
         if (file != null) {
             return file.getAbsolutePath();
         }
-        throw new IllegalStateException("Ad-hoc command file not found for UUID: " + id);
+        return getNewAdHocCommandFile(id);
     }
 
     public static String getNewAdHocCommandFile(UUID id) {
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 7b94e9d..45f5a37 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 main: me.playbosswar.com.CommandTimerPlugin
 name: "CommandTimer"
-version: "8.16.0"
+version: "8.16.1"
 description: "Schedule commands like you want"
 author: PlayBossWar
 api-version: 1.13