diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/Direction.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/Direction.java
index f0c5fb55a7..a2b4845a50 100644
--- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/Direction.java
+++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/Direction.java
@@ -23,6 +23,8 @@
  ********************************************************************************/
 package org.eclipse.tractusx.irs.component.enums;
 
+import java.util.NoSuchElementException;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -62,7 +64,12 @@ public static Direction fromValue(final String value) {
         return Stream.of(Direction.values())
                      .filter(direction -> direction.name.equals(value))
                      .findFirst()
-                     .orElseThrow();
+                     .orElseThrow(() -> new NoSuchElementException("Unsupported Direction: " + value
+                             + ". Must be one of: " + supportedDirections()));
+    }
+
+    private static String supportedDirections() {
+        return Stream.of(Direction.values()).map(direction -> direction.name).collect(Collectors.joining(", "));
     }
 
     /**