diff --git a/examples/mini-service/src/test/functional/org/springside/examples/miniservice/functional/MiniServiceServer.java b/examples/mini-service/src/test/functional/org/springside/examples/miniservice/functional/MiniServiceServer.java
index 2d003a75..0fbaf7ac 100644
--- a/examples/mini-service/src/test/functional/org/springside/examples/miniservice/functional/MiniServiceServer.java
+++ b/examples/mini-service/src/test/functional/org/springside/examples/miniservice/functional/MiniServiceServer.java
@@ -21,15 +21,19 @@ public class MiniServiceServer {
 
 		//启动Jetty
 		Server server = JettyFactory.createServerInSource(PORT, CONTEXT);
-		server.start();
+		try {
+			server.start();
 
-		System.out.println("Server running at " + BASE_URL);
-		System.out.println("Hit Enter in console to stop server");
+			System.out.println("Server running at " + BASE_URL);
+			System.out.println("Hit Enter in console to stop server");
 
-		//wait for close
-		System.in.read();
-		server.stop();
-		server.join();
-		System.out.println("Server stopped");
+			//wait for close
+			System.in.read();
+			server.stop();
+			server.join();
+			System.out.println("Server stopped");
+		} catch (Exception e) {
+			System.exit(-1);
+		}
 	}
 }
diff --git a/examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/MiniWebServer.java b/examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/MiniWebServer.java
index b3d2b065..427b05b1 100644
--- a/examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/MiniWebServer.java
+++ b/examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/MiniWebServer.java
@@ -20,15 +20,19 @@ public class MiniWebServer {
 
 		//启动Jetty
 		Server server = JettyFactory.createServerInSource(PORT, CONTEXT);
-		server.start();
+		try {
+			server.start();
 
-		System.out.println("Server running at " + BASE_URL);
-		System.out.println("Hit Enter in console to stop server");
+			System.out.println("Server running at " + BASE_URL);
+			System.out.println("Hit Enter in console to stop server");
 
-		//wait for close
-		System.in.read();
-		server.stop();
-		server.join();
-		System.out.println("Server stopped");
+			//wait for close
+			System.in.read();
+			server.stop();
+			server.join();
+			System.out.println("Server stopped");
+		} catch (Exception e) {
+			System.exit(-1);
+		}
 	}
 }
diff --git a/examples/showcase/src/test/functional/org/springside/examples/showcase/functional/ShowcaseServer.java b/examples/showcase/src/test/functional/org/springside/examples/showcase/functional/ShowcaseServer.java
index 15285aa7..4f347bbb 100644
--- a/examples/showcase/src/test/functional/org/springside/examples/showcase/functional/ShowcaseServer.java
+++ b/examples/showcase/src/test/functional/org/springside/examples/showcase/functional/ShowcaseServer.java
@@ -20,15 +20,19 @@ public class ShowcaseServer {
 
 		//启动Jetty
 		Server server = JettyFactory.createServerInSource(PORT, CONTEXT);
-		server.start();
+		try {
+			server.start();
 
-		System.out.println("Server running at " + BASE_URL);
-		System.out.println("Hit Enter in console to stop server");
+			System.out.println("Server running at " + BASE_URL);
+			System.out.println("Hit Enter in console to stop server");
 
-		//wait for close
-		System.in.read();
-		server.stop();
-		server.join();
-		System.out.println("Server stopped");
+			//wait for close
+			System.in.read();
+			server.stop();
+			server.join();
+			System.out.println("Server stopped");
+		} catch (Exception e) {
+			System.exit(-1);
+		}
 	}
 }
diff --git a/modules/extension/src/main/java/org/springside/modules/mail/MailServerSimulator.java b/modules/extension/src/main/java/org/springside/modules/mail/MailServerSimulator.java
index 49ff5bf8..84f74fa2 100644
--- a/modules/extension/src/main/java/org/springside/modules/mail/MailServerSimulator.java
+++ b/modules/extension/src/main/java/org/springside/modules/mail/MailServerSimulator.java
@@ -10,6 +10,7 @@ import com.icegreen.greenmail.util.ServerSetupTest;
 /**
  * 基于GreenMail的MailServer模拟器，用于开发/测试环境。
  * 默认在localhost的3025端口启动SMTP服务, 用户名密码是greenmail@localhost.com/greemail
+ * FactoryBean已将greenMail对象注入到Context中，可在测试中取用.
  * 
  * @author calvin
  */