diff --git a/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java b/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
index 3e7bfaf28..ae8cbef2c 100644
--- a/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
+++ b/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
@@ -61,6 +61,8 @@ import org.springframework.util.ReflectionUtils.FieldFilter;
  * @param P the concrete {@link PersistentProperty} type the {@link MappingContext} implementation creates
  * @author Jon Brisbin
  * @author Oliver Gierke
+ * @author Michael Hunger
+ * @author Thomas Darimont
  */
 public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?, P>, P extends PersistentProperty<P>>
 		implements MappingContext<E, P>, ApplicationEventPublisherAware, InitializingBean {
@@ -168,14 +170,14 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
 			read.unlock();
 		}
 
-		if (strict) {
-			throw new MappingException("Unknown persistent entity " + type);
-		}
-
 		if (!shouldCreatePersistentEntityFor(type)) {
 			return null;
 		}
 
+		if (strict) {
+			throw new MappingException("Unknown persistent entity " + type);
+		}
+
 		return addPersistentEntity(type);
 	}
 
diff --git a/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java b/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java
index 755ed8f55..a1fba1f11 100644
--- a/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java
+++ b/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright 2011-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,6 +42,7 @@ import org.springframework.data.util.TypeInformation;
  * Unit test for {@link AbstractMappingContext}.
  * 
  * @author Oliver Gierke
+ * @author Thomas Darimont
  */
 public class AbstractMappingContextUnitTests {
 
@@ -213,6 +214,16 @@ public class AbstractMappingContextUnitTests {
 		}
 	}
 
+	/**
+	 * @see DATACMNS-447
+	 */
+	@Test
+	public void shouldReturnNullForSimpleTypesIfInStrictIsEnabled() {
+
+		context.setStrict(true);
+		assertThat(context.getPersistentEntity(Integer.class), is(nullValue()));
+	}
+
 	class Person {
 		String name;
 	}