diff --git a/src/controllers/protection.js b/src/controllers/protection.js
index c7783a5..f0b6779 100644
--- a/src/controllers/protection.js
+++ b/src/controllers/protection.js
@@ -922,7 +922,7 @@ export function checkProtectionLocked(r, c, sheetIndex, isOpenAlert=true, isLock
 //cell hidden state
 export function checkProtectionCellHidden(r, c, sheetIndex){
     let sheetFile = sheetmanage.getSheetByIndex(sheetIndex);
-    if(!sheetFile || !sheetFile.data[r] || !sheetFile.data[r][c]){
+    if(!sheetFile || (sheetFile.data && !sheetFile.data[r]) || (sheetFile.data && !sheetFile.data[r][c])){
         return true;
     }
 
diff --git a/src/controllers/select.js b/src/controllers/select.js
index 7371b8b..1aacd03 100644
--- a/src/controllers/select.js
+++ b/src/controllers/select.js
@@ -403,10 +403,10 @@ function collaborativeEditBox() {
             if (Object.keys(range).length > 0 ) {
                 let flag_sure_merge = false
                 if(range.v.length > 1) {
-                    flag_sure_merge = Object.keys(range.v[1][0]).length > 0
+                    flag_sure_merge = range.v[1][0] == null || Object.keys(range.v[1][0]).length > 0
                 }
                 if(range.v[0].length > 1) {
-                    flag_sure_merge = Object.keys(range.v[0][1]).length > 0
+                    flag_sure_merge = range.v[0][1] == null || Object.keys(range.v[0][1]).length > 0
                 }
                 if(flag_sure_merge) {
                     // 合并成一个时执行