diff --git a/src/main/java/device/cdPlayer/CDPlayer.java b/src/main/java/device/cdPlayer/CDPlayer.java
index d70ffca..561e456 100644
--- a/src/main/java/device/cdPlayer/CDPlayer.java
+++ b/src/main/java/device/cdPlayer/CDPlayer.java
@@ -89,6 +89,9 @@ public class CDPlayer implements Device {
         if(this.loadedCD==null){
             throw new ReturnValueNullException();
         }
+        if(!(itemNr>=0  && itemNr<loadedCD.getPlayList().length)){
+            throw new ItemNumberNotFoundException();
+        }
         return null;
     }
 
diff --git a/src/main/java/device/cdPlayer/exceptions/ItemNumberNotFoundException.java b/src/main/java/device/cdPlayer/exceptions/ItemNumberNotFoundException.java
new file mode 100644
index 0000000..6491fa9
--- /dev/null
+++ b/src/main/java/device/cdPlayer/exceptions/ItemNumberNotFoundException.java
@@ -0,0 +1,7 @@
+package device.cdPlayer.exceptions;
+
+public class ItemNumberNotFoundException extends RuntimeException {
+    public ItemNumberNotFoundException() {
+        super("Given ItemNumber ist not in the Album.");
+    }
+}
diff --git a/src/test/java/device/cdPlayer/CDPlayerTest.java b/src/test/java/device/cdPlayer/CDPlayerTest.java
index b820e8f..c5d4329 100644
--- a/src/test/java/device/cdPlayer/CDPlayerTest.java
+++ b/src/test/java/device/cdPlayer/CDPlayerTest.java
@@ -330,13 +330,28 @@ class CDPlayerTest {
     @ParameterizedTest
     @MethodSource("chooseItemTestData")
     void chooseItemTest(String testName,String cases, CDPlayer _cdPlayer,Exception exception , String expectedResult) {
-        Exception newException = assertThrows(exception.getClass(), () -> _cdPlayer.chooseItem(1));
-        assertEquals(ReturnValueNullException.class, newException.getClass());
+        if(cases.equals("Case1")) {
+            Exception newException = assertThrows(exception.getClass(), () -> _cdPlayer.chooseItem(1));
+            assertEquals(ReturnValueNullException.class, newException.getClass());
+        }
+        if(cases.equals("Case2")) {
+            Exception newException = assertThrows(exception.getClass(), () -> _cdPlayer.chooseItem(200));
+            assertEquals(ItemNumberNotFoundException.class, newException.getClass());
+        }
     }
     static Stream<Arguments> chooseItemTestData () {
         CDPlayer cdPlayer1 = new CDPlayer();
+
+        String[] audioPlayList=new String[]{"Audio 01","Audio 02","Audio 03","Audio 04","Audio 05"};
+        CD audioCD1=new CD("Audio",audioPlayList);
+        CDPlayer cdPlayer2 = new CDPlayer();
+        cdPlayer2.tapOnCdFlap();
+        cdPlayer2.setCD(audioCD1);
+        cdPlayer2.tapOnCdFlap();
+
         return Stream.of(
-                Arguments.of("[chooseItem() by notSetCD ] => shouldThrowReturnValueNullException","Case1", cdPlayer1,new ReturnValueNullException(),"")
+                Arguments.of("[chooseItem() by notSetCD ] => shouldThrowReturnValueNullException","Case1", cdPlayer1,new ReturnValueNullException(),""),
+                Arguments.of("[chooseItem() by invalidInput ] => shouldThrowItemNumberNotFoundException","Case2", cdPlayer2,new ItemNumberNotFoundException(),"")
         );
     }