diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/RelationshipInfo.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/RelationshipInfo.java
index f96eec5e3..f1d718e2f 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/RelationshipInfo.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/RelationshipInfo.java
@@ -55,9 +55,10 @@ public class RelationshipInfo {
     }
 
     private boolean isNodeEntity(TypeInformation<?> targetType) {
-        if (targetType.getType().isAnnotationPresent(NodeEntity.class)) return true;
-        if (targetType.getType().isAnnotationPresent(RelationshipEntity.class)) return false;
-        throw new MappingException("Target type for relationship "+ type +" field is invalid "+targetType);
+        final Class<?> type = targetType.getType();
+        if (type.isAnnotationPresent(NodeEntity.class)) return true;
+        if (type.isAnnotationPresent(RelationshipEntity.class)) return false;
+        throw new MappingException("Target type for relationship "+ this.type +" field is invalid "+type);
     }
 
     public static RelationshipInfo fromField(Field field, TypeInformation<?> typeInformation) {
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/MatchClauseUnitTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/MatchClauseUnitTest.java
index 7a24c9006..ffda810ea 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/MatchClauseUnitTest.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/MatchClauseUnitTest.java
@@ -76,6 +76,7 @@ public class MatchClauseUnitTest {
 		private Group group;
 	}
 
+    @NodeEntity
 	class Group {
 
 		@Indexed