diff --git a/spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyDemo.java b/spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyDemo.java
index f35b0392d1..b779a58718 100644
--- a/spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyDemo.java
+++ b/spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyDemo.java
@@ -1,4 +1,5 @@
-/* Copyright 2002-2008 the original author or authors.
+/**
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,13 +21,19 @@ import java.io.IOException;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
+ * Demonstrates the handling of Exceptions in an asynchronous messaging
+ * environment. View the 'errorHandlingDemo.xml' configuration file within
+ * this same package. Notice the use of a <header-enricher/> element
+ * within a <chain/> that establishes an 'error-channel' reference
+ * prior to passing the message to a <service-activator/>.
+ *
  * @author Iwein Fuld
  */
 public class PartyDemo {
 
 	public static void main(String[] args) {
 		new ClassPathXmlApplicationContext("errorHandlingDemo.xml", PartyDemo.class);
-		System.out.println("hit key to stop");
+		System.out.println("hit any key to stop");
 		try {
 			System.in.read();
 		}
diff --git a/spring-integration-samples/errorhandling/src/main/resources/org/springframework/integration/samples/errorhandling/errorHandlingDemo.xml b/spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/errorHandlingDemo.xml
similarity index 100%
rename from spring-integration-samples/errorhandling/src/main/resources/org/springframework/integration/samples/errorhandling/errorHandlingDemo.xml
rename to spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/errorHandlingDemo.xml