diff --git a/src/de/dhbwstuttgart/bytecode/BytecodeGen.java b/src/de/dhbwstuttgart/bytecode/BytecodeGen.java
index c21ee60b..425582ad 100644
--- a/src/de/dhbwstuttgart/bytecode/BytecodeGen.java
+++ b/src/de/dhbwstuttgart/bytecode/BytecodeGen.java
@@ -353,7 +353,7 @@ public class BytecodeGen implements ASTVisitor {
 	@Override
 	public void visit(ExpressionReceiver expressionReceiver) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 }
diff --git a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/TypeGenerator.java b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/TypeGenerator.java
index ed0f06af..c60ae322 100644
--- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/TypeGenerator.java
+++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/TypeGenerator.java
@@ -105,7 +105,16 @@ public class TypeGenerator {
     }
 
     public static RefTypeOrTPHOrWildcardOrGeneric convert(Java8Parser.ReferenceTypeContext referenceTypeContext, JavaClassRegistry reg, GenericsRegistry generics) {
-        return convertTypeName(referenceTypeContext.getText(), referenceTypeContext.getStart(), reg, generics);
+        if(referenceTypeContext.classOrInterfaceType() != null){
+            if(referenceTypeContext.classOrInterfaceType().classType_lfno_classOrInterfaceType()!= null){
+                Java8Parser.ClassType_lfno_classOrInterfaceTypeContext ctx = referenceTypeContext.classOrInterfaceType().classType_lfno_classOrInterfaceType();
+                return convertTypeName(ctx.Identifier().toString(), ctx.typeArguments(),referenceTypeContext.getStart(), reg, generics);
+            }else{
+                throw new NotImplementedException();
+            }
+        }else{
+            throw new NotImplementedException();
+        }
     }
 
     public static RefTypeOrTPHOrWildcardOrGeneric convertTypeName(String name, Token offset, JavaClassRegistry reg, GenericsRegistry generics){