diff --git a/eco-api/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKeyType.java b/eco-api/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKeyType.java
index d8cd4c4e..86b778e7 100644
--- a/eco-api/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKeyType.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKeyType.java
@@ -11,6 +11,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.Objects;
 
 /**
@@ -112,7 +113,7 @@ public final class PersistentDataKeyType<T> {
         DataTypeSerializer<T> serializer = this.serializers.get(handler);
 
         if (serializer == null) {
-            throw new IllegalArgumentException("No serializer for handler: " + handler);
+            throw new NoSuchElementException("No serializer for handler: " + handler);
         }
 
         return serializer;