diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index a9d1d6a51a..0151feac8e 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -423,12 +423,11 @@ class BaseDocument(object):
 				return "{}: {}: {}".format(_("Error"), _("Data missing in table"), _(df.label))
 
 			elif self.parentfield:
-
 				return "{}: {} {} #{}: {}: {}".format(_("Error"), frappe.bold(_(self.doctype)),
 					_("Row"), self.idx, _("Value missing for"), _(df.label))
 
 			else:
-				return "{}: {}: {}".format(_("Error"), _("Value missing for"), _(df.label))
+				return _("Error: Value missing for {0}: {1}").format(_(df.parent), _(df.label))
 
 		missing = []
 
diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js
index dde00cf5a0..39a82b3ee1 100755
--- a/frappe/public/js/frappe/form/control.js
+++ b/frappe/public/js/frappe/form/control.js
@@ -1761,10 +1761,10 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
 					});
 				},
 				onChange: function(value) {
-					me._last_change_on = new Date();
 					me.parse_validate_and_set_in_model(value);
 				},
 				onKeydown: function(e) {
+					this._last_change_on = new Date();
 					var key = frappe.ui.keys.get_key(e);
 					// prevent 'New DocType (Ctrl + B)' shortcut in editor
 					if(['ctrl+b', 'meta+b'].indexOf(key) !== -1) {