diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
index bc25d62104e..41c762370f7 100644
--- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
+++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
@@ -166,8 +166,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator implemen
 
 	private HttpMessageConverter<?>[] messageConverters =
 			new HttpMessageConverter[]{new ByteArrayHttpMessageConverter(), new StringHttpMessageConverter(),
-					new FormHttpMessageConverter(), new SourceHttpMessageConverter(), 
-					new BufferedImageHttpMessageConverter()};
+					new FormHttpMessageConverter(), new SourceHttpMessageConverter()};
 
 	public AnnotationMethodHandlerAdapter() {
 		// no restriction of HTTP methods by default
diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java b/org.springframework.web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
index 9880e6ae2c7..ceaf7f8ac50 100644
--- a/org.springframework.web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
+++ b/org.springframework.web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
@@ -116,7 +116,7 @@ public class BufferedImageHttpMessageConverter extends AbstractHttpMessageConver
 	/** Sets the cache directory. If this property is set to an existing directory, this converter will cache image data. */
 	public void setCacheDir(File cacheDir) {
 		Assert.notNull(cacheDir, "'cacheDir' must not be null");
-		Assert.isTrue(cacheDir.isDirectory(), "'cacheDir' is not a valid directory");
+		Assert.isTrue(cacheDir.isDirectory(), "'cacheDir' is not a directory");
 		this.cacheDir = cacheDir;
 	}
 
diff --git a/org.springframework.web/src/main/java/org/springframework/web/client/RestTemplate.java b/org.springframework.web/src/main/java/org/springframework/web/client/RestTemplate.java
index 683bcad3fc9..515869ffbf4 100644
--- a/org.springframework.web/src/main/java/org/springframework/web/client/RestTemplate.java
+++ b/org.springframework.web/src/main/java/org/springframework/web/client/RestTemplate.java
@@ -94,8 +94,7 @@ public class RestTemplate extends HttpAccessor implements RestOperations {
 
 	private HttpMessageConverter<?>[] messageConverters =
 			new HttpMessageConverter[]{new ByteArrayHttpMessageConverter(), new StringHttpMessageConverter(),
-					new FormHttpMessageConverter(), new SourceHttpMessageConverter(),
-					new BufferedImageHttpMessageConverter()};
+					new FormHttpMessageConverter(), new SourceHttpMessageConverter()};
 
 	private ResponseErrorHandler errorHandler = new DefaultResponseErrorHandler();