diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
index d5958069de..f197485359 100644
--- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
+++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
@@ -62,7 +62,7 @@ import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMeth
  * @see #handleTypeMismatch
  * @see #handleHttpMessageNotReadable
  * @see #handleHttpMessageNotWritable
- * @see #handleRequestBodyNotValidException
+ * @see #handleMethodArgumentNotValidException
  */
 public class DefaultHandlerExceptionResolver extends AbstractHandlerExceptionResolver {
 
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/DefaultFlashMapManager.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/DefaultFlashMapManager.java
index 189f301390..7b07b73044 100644
--- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/DefaultFlashMapManager.java
+++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/DefaultFlashMapManager.java
@@ -121,7 +121,9 @@ public class DefaultFlashMapManager implements FlashMapManager {
 		
 		if (!matches.isEmpty()) {
 			Collections.sort(matches);
-			return matches.remove(0);
+			FlashMap match = matches.remove(0);
+			allMaps.remove(match);
+			return match;
 		}
 		
 		return null;
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/support/FlashMapTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/FlashMapTests.java
similarity index 99%
rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/support/FlashMapTests.java
rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/FlashMapTests.java
index aea9a13845..20f1639527 100644
--- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/support/FlashMapTests.java
+++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/FlashMapTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.servlet.support;
+package org.springframework.web.servlet;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/support/DefaultFlashMapManagerTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/support/DefaultFlashMapManagerTests.java
index 581e115878..96accc2cb5 100644
--- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/support/DefaultFlashMapManagerTests.java
+++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/support/DefaultFlashMapManagerTests.java
@@ -71,6 +71,7 @@ public class DefaultFlashMapManagerTests {
 		this.flashMapManager.requestStarted(this.request);
 		
 		assertSame(flashMap, request.getAttribute(DefaultFlashMapManager.PREVIOUS_FLASH_MAP_ATTRIBUTE));
+		assertEquals("Previous FlashMap should have been removed", 0, allMaps.size());
 	}
 	
 	@Test