diff --git a/src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java b/src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java
index a1b729f..3a6019d 100644
--- a/src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java
+++ b/src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java
@@ -140,12 +140,14 @@ public class JwtTokenUtil implements Serializable {
         Claims payload = getAllClaimsFromToken(token);
         List<LinkedHashMap> groupList = payload.get("group", ArrayList.class);
         List<JwtGroupModel> r = new ArrayList<>();
-
-        for(LinkedHashMap<String, String> map : groupList){
-            JwtGroupModel model = new JwtGroupModel();
-            model.setGroupId(map.get("groupId"));
-            model.setGroupAuthCd(map.get("groupAuthCd"));
-            r.add(model);
+        
+        if(groupList!=null) {
+	        for(LinkedHashMap<String, String> map : groupList){
+	            JwtGroupModel model = new JwtGroupModel();
+	            model.setGroupId(map.get("groupId"));
+	            model.setGroupAuthCd(map.get("groupAuthCd"));
+	            r.add(model);
+	        }
         }
         return r;
     }
diff --git a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java
index fb77908..2db52f7 100644
--- a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java
+++ b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java
@@ -1510,12 +1510,14 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
 		  
 		  
 		  for(CtrCntrlGroupModel list : model) {
-			  for(JwtGroupModel lists : groupAuth) {
-				  if(list.getGroupId().equals(lists.getGroupId())) {
-					  list.setGroupAuthCd(lists.getGroupAuthCd());
-					  break;
-				  }else {
-					  list.setGroupAuthCd("");
+			  if(groupAuth != null) {
+				  for(JwtGroupModel lists : groupAuth) {
+					  if(list.getGroupId().equals(lists.getGroupId())) {
+						  list.setGroupAuthCd(lists.getGroupAuthCd());
+						  break;
+					  }else {
+						  list.setGroupAuthCd("");
+					  }
 				  }
 			  }
 		  }