diff --git a/frappe/public/js/frappe/form/save.js b/frappe/public/js/frappe/form/save.js
index cc02d2f8a85..d4d8daf18df 100644
--- a/frappe/public/js/frappe/form/save.js
+++ b/frappe/public/js/frappe/form/save.js
@@ -65,7 +65,7 @@ frappe.ui.form.save = function (frm, action, callback, btn) {
 
 			const is_empty_row = function(cells) {
 				for (let i = 0; i < cells.length; i++) {
-					if (locals[doc.doctype][doc.name][cells[i].fieldname]) {
+					if (locals[doc.doctype][doc.name] && locals[doc.doctype][doc.name][cells[i].fieldname]) {
 						return false;
 					}
 				}
diff --git a/frappe/public/js/frappe/model/model.js b/frappe/public/js/frappe/model/model.js
index 4100abad354..7c1d7f559e0 100644
--- a/frappe/public/js/frappe/model/model.js
+++ b/frappe/public/js/frappe/model/model.js
@@ -677,8 +677,8 @@ $.extend(frappe.model, {
 
 	get_all_docs: function(doc) {
 		var all = [doc];
-		for(var key in doc) {
-			if($.isArray(doc[key])) {
+		for (var key in doc) {
+			if ($.isArray(doc[key]) && !key.startsWith("_")) {
 				var children = doc[key];
 				for (var i=0, l=children.length; i < l; i++) {
 					all.push(children[i]);