diff --git a/src/main/java/de/dhbwstuttgart/bytecode/simplifyRes/GenericGenratorResultForSourceFile.java b/src/main/java/de/dhbwstuttgart/bytecode/simplifyRes/GenericGenratorResultForSourceFile.java
index f311899e7..76713ce0f 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/simplifyRes/GenericGenratorResultForSourceFile.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/simplifyRes/GenericGenratorResultForSourceFile.java
@@ -40,11 +40,11 @@ public class GenericGenratorResultForSourceFile {
 	public GenericsGeneratorResultForClass getSimplifyResultsByName(String pkgName, String name) {
 
 		if (this.pkgName.equals(pkgName)) {
-			return genericGeneratorResultForAllClasses
-					.stream()
+			return genericGeneratorResultForAllClasses.stream()
 					.filter(sr -> sr.getClassName().equals(name))
 					.findAny()
-					.orElse(new GenericsGeneratorResultForClass(name));
+					.orElseThrow(() -> new NoSuchElementException(
+							"Simplify results for the class " + pkgName + "." + name + " are not found"));
 		}
 		throw new NoSuchElementException("Simplify results for the class " + pkgName + "." + name + " are not found");
 	}