diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/SimpleTypeHolder.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/SimpleTypeHolder.java
index 05089eb82..c431ff5a6 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/SimpleTypeHolder.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/SimpleTypeHolder.java
@@ -115,6 +115,7 @@ public class SimpleTypeHolder {
 	 * @return
 	 */
 	public boolean isSimpleType(Class<?> type) {
+		Assert.notNull(type);
 		for (Class<?> clazz : simpleTypes) {
 			if (type == clazz || clazz.isAssignableFrom(type)) {
 				return true;
diff --git a/spring-data-commons-core/src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java b/spring-data-commons-core/src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java
index 54605f225..f5356a118 100644
--- a/spring-data-commons-core/src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java
+++ b/spring-data-commons-core/src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java
@@ -39,6 +39,15 @@ public class SimpleTypeHolderUnitTests {
 	public void rejectsNullOriginal() {
 		new SimpleTypeHolder(new HashSet<Class<?>>(), null);
 	}
+
+	/**
+	 * @see DATACMNS-31
+	 */
+	@Test(expected = IllegalArgumentException.class)
+	public void rejectsNullTypeForIsSimpleTypeCall() {
+		SimpleTypeHolder holder = new SimpleTypeHolder();
+		holder.isSimpleType(null);
+	}
 	
 	@Test
 	public void addsDefaultTypes() {