diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/GraphId.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/GraphId.java
index 34939598a..53564bd30 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/GraphId.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/GraphId.java
@@ -24,7 +24,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Annotation fot the field that virtually provides the Id of the graph entity (node or relationship), type of the field should be long
+ * Annotation fot the field that virtually provides the Id of the graph entity (node or relationship), type of the field should be Long
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.FIELD,ElementType.METHOD})
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4jPersistentEntityImpl.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4jPersistentEntityImpl.java
index 646051af1..3143b0a30 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4jPersistentEntityImpl.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4jPersistentEntityImpl.java
@@ -68,12 +68,6 @@ public class Neo4jPersistentEntityImpl<T> extends BasicPersistentEntity<T, Neo4j
     @Override
     public void verify() {
         super.verify();
-        if (isManaged() || getType().isInterface()) {
-            return;
-        }
-        final Neo4jPersistentProperty idProperty = getIdProperty();
-        if (idProperty == null) throw new MappingException("No id property in " + this);
-        if (idProperty.getType().isPrimitive()) throw new MappingException("The type of the id-property in " + idProperty+" must not be a primitive type but an object type like java.lang.Long");
         doWithProperties(new PropertyHandler<Neo4jPersistentProperty>() {
             Neo4jPersistentProperty unique = null;
             public void doWithPersistentProperty(Neo4jPersistentProperty persistentProperty) {
@@ -83,6 +77,12 @@ public class Neo4jPersistentEntityImpl<T> extends BasicPersistentEntity<T, Neo4j
                 }
             }
         });
+        if (isManaged() || getType().isInterface()) {
+            return;
+        }
+        final Neo4jPersistentProperty idProperty = getIdProperty();
+        if (idProperty == null) throw new MappingException("No id property in " + this);
+        if (idProperty.getType().isPrimitive()) throw new MappingException("The type of the id-property in " + idProperty+" must not be a primitive type but an object type like java.lang.Long");
     }
 
     public boolean useShortNames() {