diff --git a/frappe/core/doctype/comment/comment.py b/frappe/core/doctype/comment/comment.py
index 95d27618ef..e17b1d18df 100644
--- a/frappe/core/doctype/comment/comment.py
+++ b/frappe/core/doctype/comment/comment.py
@@ -60,6 +60,8 @@ class Comment(Document):
 				raise
 
 	def update_comments_in_parent(self, _comments):
+		if frappe.db.get_value("DocType", self.comment_doctype, "issingle"):
+			return
 		# use sql, so that we do not mess with the timestamp
 		frappe.db.sql("""update `tab%s` set `_comments`=%s where name=%s""" % (self.comment_doctype,
 			"%s", "%s"), (json.dumps(_comments), self.comment_docname))
diff --git a/frappe/translate.py b/frappe/translate.py
index bfa34d92bd..a0412a9b0b 100644
--- a/frappe/translate.py
+++ b/frappe/translate.py
@@ -138,7 +138,8 @@ def get_lang_js(fortype, name):
 def get_full_dict(lang):
 	if lang == "en":
 		return {}
-	return frappe.cache().get_value("lang:" + lang, lambda:load_lang(lang))
+	translations = load_lang(lang)
+	return frappe.cache().get_value("lang:" + lang, lambda:translations) if translations else {}
 
 def load_lang(lang, apps=None):
 	out = {}