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 06c040db3..9ffa630e2 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
@@ -96,7 +96,7 @@ public class QueryMapper {
 				} else if (null != converter) {
 					try {
 						value = converter.convertObjectId(value);
-					} catch (ConversionFailedException ignored) {
+					} catch (Exception ignored) {
 					}
 				}
 				newKey = "_id";
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/MappingTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/MappingTests.java
index 670b2def5..a84586cf5 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/MappingTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/MappingTests.java
@@ -26,6 +26,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import com.mongodb.DB;
 import com.mongodb.DBCollection;
@@ -38,14 +39,17 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.core.convert.converter.Converter;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.document.mongodb.CollectionCallback;
 import org.springframework.data.document.mongodb.MongoCollectionUtils;
 import org.springframework.data.document.mongodb.MongoDbUtils;
 import org.springframework.data.document.mongodb.MongoTemplate;
 import org.springframework.data.document.mongodb.convert.CustomConvertersUnitTests.Foo;
+import org.springframework.data.document.mongodb.convert.MappingMongoConverter;
 import org.springframework.data.document.mongodb.query.Criteria;
 import org.springframework.data.document.mongodb.query.Query;
+import sun.tools.tree.NewArrayExpression;
 
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>
@@ -358,4 +362,16 @@ public class MappingTests {
 		assertThat(results.get(1).getSsn(), is(2));
 	}
 
+	@Test
+	public void testPrimitivesAsIds() {
+		PrimitiveId p = new PrimitiveId(1);
+		p.setText("test text");
+
+		template.save(p);
+
+		PrimitiveId p2 = template.findOne(query(where("id").is(1)), PrimitiveId.class);
+		assertNotNull(p2);
+		
+	}
+
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/PrimitiveId.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/PrimitiveId.java
new file mode 100644
index 000000000..2d14b821d
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/PrimitiveId.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2011 by the original author(s).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.document.mongodb.mapping;
+
+import org.springframework.data.annotation.Id;
+
+/**
+ * @author Jon Brisbin <jbrisbin@vmware.com>
+ */
+@Document
+public class PrimitiveId {
+
+	@Id
+	int id;
+	String text;
+
+	public PrimitiveId(Integer id) {
+		this.id = id;
+	}
+
+	public int getId() {
+		return id;
+	}
+
+	public String getText() {
+		return text;
+	}
+
+	public void setText(String text) {
+		this.text = text;
+	}
+
+}