diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinServerInitializer.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinServerInitializer.java
index 7d7d7d71..165b0a5e 100644
--- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinServerInitializer.java
+++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinServerInitializer.java
@@ -29,7 +29,7 @@ public class WeixinServerInitializer extends ChannelInitializer<SocketChannel> {
 	public WeixinServerInitializer(Map<String, AesToken> aesTokenMap,
 			WeixinMessageDispatcher messageDispatcher) {
 		this.messageDispatcher = messageDispatcher;
-		messageDecoder = new WeixinMessageDecoder(aesTokenMap);
+		this.messageDecoder = new WeixinMessageDecoder(aesTokenMap);
 	}
 
 	public int addAesToken(final AesToken asetoken){
diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/startup/WeixinServerBootstrap.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/startup/WeixinServerBootstrap.java
index dc709e4b..f2a3688a 100644
--- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/startup/WeixinServerBootstrap.java
+++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/startup/WeixinServerBootstrap.java
@@ -95,7 +95,7 @@ public final class WeixinServerBootstrap {
 	 * 
 	 */
 	public WeixinServerBootstrap(String token) {
-		this(null, token, null);
+		this("", token, null);
 	}
 
 	/**
@@ -163,7 +163,7 @@ public final class WeixinServerBootstrap {
 		for (AesToken aesToken : aesTokens) {
 			this.aesTokenMap.put(aesToken.getWeixinId(), aesToken);
 		}
-		this.aesTokenMap.put(null, aesTokens[0]);
+		this.aesTokenMap.put("", aesTokens[0]);
 		this.messageHandlerList = new ArrayList<WeixinMessageHandler>();
 		this.messageInterceptorList = new ArrayList<WeixinMessageInterceptor>();
 		this.messageDispatcher = new WeixinMessageDispatcher(messageMatcher);
@@ -205,7 +205,6 @@ public final class WeixinServerBootstrap {
 		EventLoopGroup bossGroup = new NioEventLoopGroup(bossThreads);
 		EventLoopGroup workerGroup = new NioEventLoopGroup(workerThreads);
 		try {
-
 			wechatInitializer = new WeixinServerInitializer(aesTokenMap,
 					messageDispatcher);
 			ServerBootstrap b = new ServerBootstrap();
diff --git a/weixin4j-server/src/test/java/com/foxinmy/weixin4j/server/test/MessageServerStartup.java b/weixin4j-server/src/test/java/com/foxinmy/weixin4j/server/test/MessageServerStartup.java
index 521a9c99..12b06f46 100644
--- a/weixin4j-server/src/test/java/com/foxinmy/weixin4j/server/test/MessageServerStartup.java
+++ b/weixin4j-server/src/test/java/com/foxinmy/weixin4j/server/test/MessageServerStartup.java
@@ -167,6 +167,6 @@ public class MessageServerStartup {
 	 * @throws Exception
 	 */
 	public static void main(String[] args) throws Exception {
-		new MessageServerStartup().test2();
+		new MessageServerStartup().test1();
 	}
 }