diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
index 7bf86b206..fa545a9fa 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
@@ -19,7 +19,6 @@ import static org.springframework.data.mongodb.core.SerializationUtils.*;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -208,7 +207,6 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 				((ApplicationEventPublisherAware) mappingContext).setApplicationEventPublisher(eventPublisher);
 			}
 		}
-
 	}
 
 	/**
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreator.java
index 90e2a34f9..84c342d1f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreator.java
@@ -56,8 +56,8 @@ public class MongoPersistentEntityIndexCreator implements
 	 * Creats a new {@link MongoPersistentEntityIndexCreator} for the given {@link MongoMappingContext} and
 	 * {@link MongoDbFactory}.
 	 * 
-	 * @param mappingContext must not be {@@iteral null}
-	 * @param mongoDbFactory must not be {@@iteral null}
+	 * @param mappingContext must not be {@literal null}
+	 * @param mongoDbFactory must not be {@literal null}
 	 */
 	public MongoPersistentEntityIndexCreator(MongoMappingContext mappingContext, MongoDbFactory mongoDbFactory) {
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoMappingContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoMappingContext.java
index 89210b59b..6f99ea091 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoMappingContext.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoMappingContext.java
@@ -42,6 +42,15 @@ public class MongoMappingContext extends AbstractMappingContext<BasicMongoPersis
 		setSimpleTypeHolder(MongoSimpleTypes.HOLDER);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mapping.context.AbstractMappingContext#shouldCreatePersistentEntityFor(org.springframework.data.util.TypeInformation)
+	 */
+	@Override
+	protected boolean shouldCreatePersistentEntityFor(TypeInformation<?> type) {
+		return !MongoSimpleTypes.HOLDER.isSimpleType(type.getType());
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.AbstractMappingContext#createPersistentProperty(java.lang.reflect.Field, java.beans.PropertyDescriptor, org.springframework.data.mapping.MutablePersistentEntity, org.springframework.data.mapping.SimpleTypeHolder)
@@ -72,6 +81,7 @@ public class MongoMappingContext extends AbstractMappingContext<BasicMongoPersis
 	 * (non-Javadoc)
 	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
 	 */
+	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 		this.context = applicationContext;
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java
index 16feb4536..59f6dfffc 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java
@@ -124,18 +124,19 @@ public class MongoTemplateTests {
 	}
 
 	protected void cleanDb() {
-		template.dropCollection(template.getCollectionName(Person.class));
-		template.dropCollection(template.getCollectionName(PersonWithAList.class));
-		template.dropCollection(template.getCollectionName(PersonWith_idPropertyOfTypeObjectId.class));
-		template.dropCollection(template.getCollectionName(PersonWith_idPropertyOfTypeString.class));
-		template.dropCollection(template.getCollectionName(PersonWithIdPropertyOfTypeObjectId.class));
-		template.dropCollection(template.getCollectionName(PersonWithIdPropertyOfTypeString.class));
-		template.dropCollection(template.getCollectionName(PersonWithIdPropertyOfTypeInteger.class));
-		template.dropCollection(template.getCollectionName(PersonWithIdPropertyOfPrimitiveInt.class));
-		template.dropCollection(template.getCollectionName(PersonWithIdPropertyOfTypeLong.class));
-		template.dropCollection(template.getCollectionName(PersonWithIdPropertyOfPrimitiveLong.class));
-		template.dropCollection(template.getCollectionName(TestClass.class));
+		template.dropCollection(Person.class);
+		template.dropCollection(PersonWithAList.class);
+		template.dropCollection(PersonWith_idPropertyOfTypeObjectId.class);
+		template.dropCollection(PersonWith_idPropertyOfTypeString.class);
+		template.dropCollection(PersonWithIdPropertyOfTypeObjectId.class);
+		template.dropCollection(PersonWithIdPropertyOfTypeString.class);
+		template.dropCollection(PersonWithIdPropertyOfTypeInteger.class);
+		template.dropCollection(PersonWithIdPropertyOfPrimitiveInt.class);
+		template.dropCollection(PersonWithIdPropertyOfTypeLong.class);
+		template.dropCollection(PersonWithIdPropertyOfPrimitiveLong.class);
+		template.dropCollection(TestClass.class);
 		template.dropCollection(Sample.class);
+		template.dropCollection(MyPerson.class);
 	}
 
 	@Test
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/TestMongoConfiguration.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/TestMongoConfiguration.java
index 2f393b118..0701556fa 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/TestMongoConfiguration.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/TestMongoConfiguration.java
@@ -21,7 +21,7 @@ public class TestMongoConfiguration extends AbstractMongoConfiguration {
 	@Override
 	@Bean
 	public Mongo mongo() throws Exception {
-		return new Mongo("localhost", 27017);
+		return new Mongo("127.0.0.1", 27017);
 	}
 
 	@Override
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoMappingContextUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoMappingContextUnitTests.java
index ea53a2808..16f3c7d5f 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoMappingContextUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoMappingContextUnitTests.java
@@ -16,6 +16,9 @@
 
 package org.springframework.data.mongodb.core.mapping;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
 import java.util.Collections;
 import java.util.Map;
 
@@ -23,6 +26,8 @@ import org.junit.Test;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mapping.model.MappingException;
 
+import com.mongodb.DBRef;
+
 /**
  * Unit tests for {@link MongoMappingContext}.
  * 
@@ -46,6 +51,13 @@ public class MongoMappingContextUnitTests {
 		context.getPersistentEntity(ClassWithMultipleIdProperties.class);
 	}
 
+	@Test
+	public void doesNotReturnPersistentEntityForMongoSimpleType() {
+
+		MongoMappingContext context = new MongoMappingContext();
+		assertThat(context.getPersistentEntity(DBRef.class), is(nullValue()));
+	}
+
 	class ClassWithMultipleIdProperties {
 
 		@Id