diff --git a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
index fcf9c4fe..b616d094 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
@@ -1763,7 +1763,7 @@ public class EstimateService {
 
        List<ItemResponse> circuitItemList11 = estimateResponse.getRoofInfo().getCircuitItemList();
 
-        if (circuitItemList11.size() < 12){
+        if (circuitItemList11 != null && circuitItemList11.size() < 12){
             // 12개 미만인 경우, 나머지 아이템을 빈 값으로 채움
             for (int k = circuitItemList11.size(); k < 11; k++) {
                 ItemResponse emptyItem = new ItemResponse();
@@ -1778,7 +1778,7 @@ public class EstimateService {
        // 지붕면 목록에서 8개로 자름
        List<PwrGnrSimRoofResponse> roofModuleList8 = estimateResponse.getPwrGnrSim().getRoofModuleList();
 
-       if (roofModuleList8.size() < 9) {
+       if (roofModuleList8 != null && roofModuleList8.size() < 9) {
             // 9개 미만인 경우, 나머지 아이템을 빈 값으로 채움
             for (int k = roofModuleList8.size(); k < 8; k++) {
               PwrGnrSimRoofResponse emptyRoof = new PwrGnrSimRoofResponse();
@@ -1792,7 +1792,7 @@ public class EstimateService {
 
        //pcs list 3개
        List<PwrGnrSimRoofResponse> pcsList3 = estimateResponse.getPwrGnrSim().getPcsList();
-       if (pcsList3.size() < 4) {
+       if (pcsList3 != null && pcsList3.size() < 4) {
          // 4개 미만인 경우, 나머지 아이템을 빈 값으로 채움
          for (int k = pcsList3.size(); k < 4; k++) {
            PwrGnrSimRoofResponse emptyPcs = new PwrGnrSimRoofResponse();
diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml
index a70238e1..18c0995e 100644
--- a/src/main/resources/mappers/estimate/estimateMapper.xml
+++ b/src/main/resources/mappers/estimate/estimateMapper.xml
@@ -1438,10 +1438,14 @@
     <update id="updatePlanConfirmSync" parameterType="com.interplug.qcast.biz.estimate.dto.PlanSyncResponse">
         /* sqlid : com.interplug.qcast.biz.estimate.updatePlanConfirmSync */
         UPDATE T_PLAN
+        SET LAST_EDIT_DATETIME = GETDATE()
+            , LAST_EDIT_USER = 'system'
+        WHERE OBJECT_NO = #{objectNo}
+          AND PLAN_NO = #{planNo};
+
+        UPDATE T_PLAN_INFO
         SET
               ORDER_FLG = '1'
-            , LAST_EDIT_DATETIME = GETDATE()
-            , LAST_EDIT_USER = 'system'
         WHERE OBJECT_NO = #{objectNo}
           AND PLAN_NO = #{planNo}
     </update>