diff --git a/pom.xml b/pom.xml
index 9555e765a..c521e9fc2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,13 @@
 					</url>
 				</site>
 			</distributionManagement>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-javadoc-plugin</artifactId>
+					</plugin>
+				</plugins>
+			</build>
 		</profile>
 		<profile>
 			<id>strict</id>
@@ -374,18 +381,12 @@
 					<target>1.5</target>
 				</configuration>
 			</plugin>
-			<!--plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin-->
+			<!--
+				plugin> <groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId> <executions>
+				<execution> <id>attach-sources</id> <goals> <goal>jar</goal>
+				</goals> </execution> </executions> </plugin
+			-->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -417,9 +418,6 @@
 					</filesets>
 				</configuration>
 			</plugin>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-			</plugin>
 		</plugins>
 	</build>
 	<dependencyManagement>
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBean.java
index 54e9074bb..d0421acc5 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBean.java
@@ -232,8 +232,10 @@ public class FaultTolerantStepFactoryBean<T, S> extends SimpleStepFactoryBean<T,
 			// Co-ordinate the retry policy with the exception handler:
 			RepeatOperations stepOperations = getStepOperations();
 			if (stepOperations instanceof RepeatTemplate) {
-				((RepeatTemplate) stepOperations).setExceptionHandler(new SimpleRetryExceptionHandler(retryPolicy,
-						getExceptionHandler(), fatalExceptionClasses));
+				SimpleRetryExceptionHandler exceptionHandler = new SimpleRetryExceptionHandler(retryPolicy,
+						getExceptionHandler(), fatalExceptionClasses);
+				((RepeatTemplate) stepOperations).setExceptionHandler(exceptionHandler);
+				retryTemplate.registerListener(exceptionHandler);
 			}
 
 			if (retryContextCache == null) {
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FootballJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FootballJobFunctionalTests.java
index deb5a3473..a5f91e15a 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FootballJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FootballJobFunctionalTests.java
@@ -21,6 +21,15 @@ public class FootballJobFunctionalTests extends AbstractValidatingBatchLauncherT
 		this.simpleJdbcTemplate = new SimpleJdbcTemplate(dataSource);
 	}
 
+	@Override
+	protected void validatePreConditions() throws Exception {
+		simpleJdbcTemplate.update("DELETE FROM PLAYERS");
+		simpleJdbcTemplate.update("DELETE FROM GAMES");
+		simpleJdbcTemplate.update("DELETE FROM PLAYER_SUMMARY");
+		super.validatePreConditions();
+	}
+
+	@Override
 	protected void validatePostConditions() throws Exception {
 		int count = simpleJdbcTemplate.queryForInt("SELECT COUNT(*) from PLAYER_SUMMARY");
 		assertTrue(count>0);