diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/util/TypeDiscoverer.java b/spring-data-commons-core/src/main/java/org/springframework/data/util/TypeDiscoverer.java
index ae7e7ea43..7cd0707bb 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/util/TypeDiscoverer.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/util/TypeDiscoverer.java
@@ -255,7 +255,12 @@ class TypeDiscoverer<S> implements TypeInformation<S> {
 			return createInfo(parameterizedType.getActualTypeArguments()[1]);
 		} 
 		
-		return createInfo(GenericTypeResolver.resolveTypeArguments(getType(), Map.class)[1]);
+		return getTypeArgument(getType(), Map.class, 1);
+	}
+	
+	private TypeInformation<?> getTypeArgument(Class<?> type, Class<?> bound, int index) {
+		Class<?>[] arguments = GenericTypeResolver.resolveTypeArguments(type, bound);
+		return arguments == null ? null : createInfo(arguments[index]);
 	}
 
 	/* (non-Javadoc)
@@ -284,11 +289,11 @@ class TypeDiscoverer<S> implements TypeInformation<S> {
 		Class<S> rawType = getType();
 		
 		if (isMap()) {
-			return createInfo(GenericTypeResolver.resolveTypeArguments(rawType, Map.class)[0]);
+			return getTypeArgument(rawType, Map.class, 0);
 		}
 		
 		if (Iterable.class.isAssignableFrom(rawType)) {
-			return createInfo(GenericTypeResolver.resolveTypeArguments(rawType, Iterable.class)[0]);
+			return getTypeArgument(rawType, Iterable.class, 0);
 		}
 		
 		if (rawType.isArray()) {
diff --git a/spring-data-commons-core/src/test/java/org/springframework/data/util/TypeDiscovererUnitTests.java b/spring-data-commons-core/src/test/java/org/springframework/data/util/TypeDiscovererUnitTests.java
index 4b8ffe780..d90158ccd 100644
--- a/spring-data-commons-core/src/test/java/org/springframework/data/util/TypeDiscovererUnitTests.java
+++ b/spring-data-commons-core/src/test/java/org/springframework/data/util/TypeDiscovererUnitTests.java
@@ -126,6 +126,14 @@ public class TypeDiscovererUnitTests {
 		assertThat(types.get(0).getComponentType().getType(), is(equalTo((Class) String.class)));
 	}
 
+	@Test
+	@SuppressWarnings("rawtypes")
+	public void returnsNullForComponentAndValueTypesForRawMaps() {
+		TypeDiscoverer<Map> discoverer = new TypeDiscoverer<Map>(Map.class, null);
+		assertThat(discoverer.getComponentType(), is(nullValue()));
+		assertThat(discoverer.getMapValueType(), is(nullValue()));
+	}
+	
 	class SelfReferencing {
 
 		Map<String, SelfReferencingMap> parent;