diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/Actions.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/Actions.java
index d5e889c9..ca136cac 100644
--- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/Actions.java
+++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/Actions.java
@@ -29,7 +29,6 @@ import org.leavesmc.leaves.entity.bot.action.BotAction;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 
 public class Actions {
@@ -63,8 +62,10 @@ public class Actions {
         Class<?> actionClass = action.getInterfaceClass();
         if (actionClass == null && action instanceof CraftCustomAction<?> act) {
             actionClass = act.getRealActionClass();
+        } else {
+            throw new IllegalArgumentException("Action " + action.getName() + " does not registered.");
         }
-        return Objects.requireNonNull(actionClass, "Class " + action.getClass() + " is not registered as a BotAction!");
+        return actionClass;
     }
 
     public static boolean register(@NotNull CraftBotAction<?> action) {
diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftCustomAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftCustomAction.java
index d8fc5239..68c7e464 100644
--- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftCustomAction.java
+++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftCustomAction.java
@@ -1,10 +1,11 @@
 package org.leavesmc.leaves.bot.agent.actions;
 
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public interface CraftCustomAction<E> {
     E createCraft(@Nullable Player player, String[] args);
 
-    Class<?> getRealActionClass();
+    @NotNull Class<?> getRealActionClass();
 }
diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftCustomBotAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftCustomBotAction.java
index 18f5e668..1e1dfcfe 100644
--- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftCustomBotAction.java
+++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftCustomBotAction.java
@@ -36,7 +36,7 @@ public class CraftCustomBotAction extends CraftBotAction<AbstractCustomBotAction
     }
 
     @Override
-    public Class<?> getRealActionClass() {
+    public @NotNull Class<?> getRealActionClass() {
         return realAction.getClass();
     }
 }
diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftCustomStateBotAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftCustomStateBotAction.java
index 7486c200..b35c8084 100644
--- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftCustomStateBotAction.java
+++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftCustomStateBotAction.java
@@ -36,7 +36,7 @@ public class CraftCustomStateBotAction extends CraftStateBotAction<AbstractCusto
     }
 
     @Override
-    public Class<?> getRealActionClass() {
+    public @NotNull Class<?> getRealActionClass() {
         return realAction.getClass();
     }
 }
diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftCustomTimerBotAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftCustomTimerBotAction.java
index abe9bfbe..25281ff9 100644
--- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftCustomTimerBotAction.java
+++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftCustomTimerBotAction.java
@@ -35,7 +35,7 @@ public class CraftCustomTimerBotAction extends CraftTimerBotAction<AbstractCusto
     }
 
     @Override
-    public Class<?> getRealActionClass() {
+    public @NotNull Class<?> getRealActionClass() {
         return realAction.getClass();
     }
 }