diff --git a/spring-webflow/src/main/java/org/springframework/webflow/context/ExternalContextHolder.java b/spring-webflow/src/main/java/org/springframework/webflow/context/ExternalContextHolder.java
index 1a66db32..33bd695d 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/context/ExternalContextHolder.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/context/ExternalContextHolder.java
@@ -19,7 +19,7 @@ import org.springframework.util.Assert;
 
 /**
  * Simple holder class that associates an {@link ExternalContext} instance with
- * the current thread. The ExternalContext will be inherited by any child
+ * the current thread. The ExternalContext will not be inherited by any child
  * threads spawned by the current thread.
  * <p>
  * Used as a central holder for the current ExternalContext in Spring Web Flow,
@@ -45,7 +45,8 @@ public final class ExternalContextHolder {
 
 	/**
 	 * Return the ExternalContext associated with the current thread, if any.
-	 * @return the current ExternalContext, or <code>null</code> if none
+	 * @return the current ExternalContext
+	 * @throws IllegalStateException if no ExternalContext is bound to this thread 
 	 */
 	public static ExternalContext getExternalContext() {
 		Assert.state(externalContextHolder.get() != null, "No external context is bound to this thread");