diff --git a/CommandFramework/CommandFrameworkBase/src/de/steamwar/command/handler/SupplierHandler.java b/CommandFramework/CommandFrameworkBase/src/de/steamwar/command/handler/SupplierHandler.java
index a620b34c..fd203ac8 100644
--- a/CommandFramework/CommandFrameworkBase/src/de/steamwar/command/handler/SupplierHandler.java
+++ b/CommandFramework/CommandFrameworkBase/src/de/steamwar/command/handler/SupplierHandler.java
@@ -40,8 +40,8 @@ public final class SupplierHandler {
             if (method.getParameterCount() != 0) {
                 throw new UnsupportedOperationException("Supplier method must have no parameters");
             }
-            if (!AbstractTypeMapper.class.isAssignableFrom(method.getReturnType())) {
-                throw new UnsupportedOperationException("Supplier method must return AbstractTypeMapper");
+            if (!AbstractTypeSupplier.class.isAssignableFrom(method.getReturnType())) {
+                throw new UnsupportedOperationException("Supplier method must return AbstractTypeSupplier");
             }
 
             if (annotation.value() != null && !annotation.value().isEmpty()) {