diff --git a/src/main/c/Tim/hangman.c b/src/main/c/Tim/hangman.c
index 33293be..0f7c94d 100644
--- a/src/main/c/Tim/hangman.c
+++ b/src/main/c/Tim/hangman.c
@@ -55,6 +55,13 @@ void hangman()
 
 char* getWordFromList(int x)
 {
-    return wordlist[x];
+    if(x<LISTSIZE)
+    {
+        return wordlist[x];
+    }
+    else
+    {
+        return "Index nicht vorhanden";
+    }
 }
 
diff --git a/src/test/c/Tim/test_hangman.c b/src/test/c/Tim/test_hangman.c
index 6ae6216..074a1c5 100644
--- a/src/test/c/Tim/test_hangman.c
+++ b/src/test/c/Tim/test_hangman.c
@@ -36,4 +36,17 @@ void test_getWordFromList_Kleiderschrank_5()
     strcpy(actualResult,getWordFromList(pos));
     //assert
     TEST_ASSERT_EQUAL_STRING(expectedResult, actualResult);
+}
+
+
+void test_getWordFromList_IndexOutOfList()
+{
+    //arrange
+    int pos = 15;
+    char expectedResult[] = "Index nicht vorhanden";
+    //act
+    char actualResult[30];
+    strcpy(actualResult,getWordFromList(pos));
+    //assert
+    TEST_ASSERT_EQUAL_STRING(expectedResult, actualResult);
 }
\ No newline at end of file