diff --git a/src/main/java/com/smallchill/core/beetl/func/AceExt.java b/src/main/java/com/smallchill/core/beetl/func/AceExt.java
index 705014ed..72b326d9 100644
--- a/src/main/java/com/smallchill/core/beetl/func/AceExt.java
+++ b/src/main/java/com/smallchill/core/beetl/func/AceExt.java
@@ -31,6 +31,9 @@ import com.smallchill.core.toolbox.kit.CacheKit;
 public class AceExt {
 
 	public String theme() {
+		if (null == ShiroKit.getUser()) {
+			return "ace-dark.css";
+		}
 		Map<String, String> theme = CacheKit.get(ConstCache.FILE_CACHE, ConstCacheKey.ACE_THEME + ShiroKit.getUser().getId(), new ILoader() {
 			public Object load() {
 				Map<String, String> map = new HashMap<String, String>();
diff --git a/src/main/java/com/smallchill/system/controller/CacheController.java b/src/main/java/com/smallchill/system/controller/CacheController.java
index 5e7b0a55..3fc50209 100644
--- a/src/main/java/com/smallchill/system/controller/CacheController.java
+++ b/src/main/java/com/smallchill/system/controller/CacheController.java
@@ -135,11 +135,7 @@ public class CacheController extends BaseController {
 
 	/**
 	 * 根据字典编号获取下拉框
-	 * 
-	 * @param code
-	 *            编号
-	 * @param num
-	 *            分组
+	 *
 	 * @return String
 	 */
 	@SuppressWarnings("rawtypes")
@@ -407,6 +403,9 @@ public class CacheController extends BaseController {
 	@ResponseBody
 	@RequestMapping("/theme")
 	public AjaxResult theme() {
+		if (null == ShiroKit.getUser()) {
+			return error("error");
+		}
 		Map<String, String> theme = CacheKit.get(ConstCache.FILE_CACHE, ConstCacheKey.ACE_THEME + ShiroKit.getUser().getId() , new ILoader() {
 			public Object load() {
 				Map<String, String> map = new HashMap<String, String>();
diff --git a/src/main/webapp/WEB-INF/view/common/_tabtoolbar.html b/src/main/webapp/WEB-INF/view/common/_tabtoolbar.html
index 6a492223..ad0eb659 100644
--- a/src/main/webapp/WEB-INF/view/common/_tabtoolbar.html
+++ b/src/main/webapp/WEB-INF/view/common/_tabtoolbar.html
@@ -104,7 +104,11 @@
                btn: ['确定', '取消'] //按钮
            }, function () {
 	   			var ajax = new $ax("${ctxPath}/cache/theme", function(data){
-					window.location.href="${ctxPath}/";
+	   			    if (data.code === 0) {
+                        window.location.href="${ctxPath}/";
+					} else {
+                        window.location.href="${ctxPath}/login";
+					}
 				});
 				ajax.start();
            }, function () {});