From 21f859e222cf78ca8485e0f479bffd38d85838a2 Mon Sep 17 00:00:00 2001
From: Jon Brisbin <jon@jbrisbin.com>
Date: Wed, 27 Apr 2011 11:17:06 -0500
Subject: [PATCH] DATADOC-97 - Fixed an NPE in the QueryMapper class.

---
 .../data/document/mongodb/query/QueryMapper.java                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/QueryMapper.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/QueryMapper.java
index 22341c58d..d8b0aa3f9 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/QueryMapper.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/QueryMapper.java
@@ -46,7 +46,7 @@ public class QueryMapper<T> {
 
 	public DBObject getMappedObject() {
 		String idKey = null;
-		if (null != entity) {
+		if (null != entity && null != entity.getIdProperty()) {
 			idKey = entity.getIdProperty().getName();
 		} else if (query.containsField("id")) {
 			idKey = "id";