diff --git a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj
index a9985e9c7e..03da850fdc 100644
--- a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj
+++ b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj
@@ -27,18 +27,21 @@ package org.springframework.mock.staticmock;
*
This aspect also provides static methods to simplify the programming model for
* setting expectations and entering playback mode.
*
- *
Usage:
+ *
Usage
*
* - Annotate a test class with {@code @MockStaticEntityMethods}.
- *
- In each test method, {@code AnnotationDrivenStaticEntityMockingControl}
+ *
- In each test method, the {@code AnnotationDrivenStaticEntityMockingControl}
* will begin in recording mode.
*
- Invoke static methods on JPA-annotated {@code @Entity} classes, with each
- * recording-mode invocation being followed by an invocation of either the static
- * {@link #expectReturn(Object)} method or the static {@link #expectThrow(Throwable)}
- * method on {@code AnnotationDrivenStaticEntityMockingControl}.
- *
- Invoke the static {@link #playback()} method.
- *
- Call the code you wish to test that uses the static methods.
- *
- Verification will occur automatically.
+ * recording-mode invocation being followed by an invocation of either
+ * {@link #expectReturn(Object)} or {@link #expectThrow(Throwable)} on the
+ * {@code AnnotationDrivenStaticEntityMockingControl}.
+ *
- Invoke the {@link #playback()} method.
+ *
- Call the code you wish to test that uses the static methods on the
+ * JPA-annotated {@code @Entity} classes.
+ *
- Verification will occur automatically after the test method has executed
+ * and returned. However, mock verification will not occur if the test method
+ * throws an exception.
*
*
* @author Rod Johnson