diff --git a/components/_util/props-util/index.js b/components/_util/props-util/index.js
index c35e796fc..cf541dcf2 100644
--- a/components/_util/props-util/index.js
+++ b/components/_util/props-util/index.js
@@ -339,9 +339,10 @@ export function isEmptyContent(c) {
 
 export function isEmptyElement(c) {
   return (
-    c.type === Comment ||
-    (c.type === Fragment && c.children.length === 0) ||
-    (c.type === Text && c.children.trim() === '')
+    c &&
+    (c.type === Comment ||
+      (c.type === Fragment && c.children.length === 0) ||
+      (c.type === Text && c.children.trim() === ''))
   );
 }
 
diff --git a/v2-doc b/v2-doc
index d2c096476..57c08127b 160000
--- a/v2-doc
+++ b/v2-doc
@@ -1 +1 @@
-Subproject commit d2c096476ee3e8d27fbb9e1cb7933887501b1fab
+Subproject commit 57c08127bf0e3e826b03f845df3e1332820964e5