diff --git a/amd.js b/amd.js
index fdce012..7cdefbb 100644
--- a/amd.js
+++ b/amd.js
@@ -10,14 +10,9 @@ var _ = fis.util;
 var amd = module.exports = function(info, conf) {
   var file = info.file;
 
-  try {
-    autowrap(info, conf);
-    info.content = parse(file, info.content, conf);
-    info.content = amd.restoreFISLang(info.content);
-  } catch (e) {
-    fis.log.warn('Got Error: %s while parse [%s].', e.message, file.subpath);
-    fis.log.debug(e.stack);
-  }
+  autowrap(info, conf);
+  info.content = parse(file, info.content, conf);
+  info.content = amd.restoreFISLang(info.content);
 };
 
 // 判断是否是 amd
diff --git a/index.js b/index.js
index 28f631e..f0895ec 100644
--- a/index.js
+++ b/index.js
@@ -40,7 +40,12 @@ var entry = module.exports = function(fis, opts) {
     if (file.isMod || shimed) {
       // 用户主动配置了 shim 那么说明目标文件一定是模块化 js
       shimed && (file.isMod = true);
-      amd(info, opts);
+      try {
+        amd(info, opts);
+      } catch (e) {
+        fis.log.warn('Got Error: %s while parse [%s].', e.message, file.subpath);
+        fis.log.debug(e.stack);
+      }
     } else {
       
       // 先尝试 amd 解析，失败则走 commonJs
diff --git a/package.json b/package.json
index 0c5258e..1c67dce 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fis3-hook-amd",
-  "version": "0.0.6",
+  "version": "0.1.0",
   "description": "fis3 amd",
   "main": "index.js",
   "scripts": {
@@ -25,6 +25,6 @@
     "escope": "^3.2.0",
     "esprima": "^2.5.0",
     "estraverse": "^4.1.0",
-    "fis3-hook-commonjs": "0.0.1"
+    "fis3-hook-commonjs": "0.1.0"
   }
 }