diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py
index c393bec420..d1006bf0ed 100644
--- a/frappe/model/db_query.py
+++ b/frappe/model/db_query.py
@@ -55,7 +55,7 @@ class DatabaseQuery(object):
 	
 		if self.with_childnames:
 			for t in self.tables:
-				if t != "`tab" + doctype + "`":
+				if t != "`tab" + self.doctype + "`":
 					fields.append(t + ".name as '%s:name'" % t[4:-1])
 	
 		# query dict
diff --git a/frappe/model/doc.py b/frappe/model/doc.py
index 65904cee06..33e51bde15 100755
--- a/frappe/model/doc.py
+++ b/frappe/model/doc.py
@@ -307,7 +307,7 @@ class Document:
 	def append_number_if_name_exists(self):
 		if frappe.db.exists(self.doctype, self.name):
 			last = frappe.db.sql("""select name from `tab{}`
-				where name regexp '{}-[[:digit:]]*' 
+				where name regexp '{}-[[:digit:]]+' 
 				order by name desc limit 1""".format(self.doctype, self.name))
 			
 			if last:
diff --git a/frappe/utils/response.py b/frappe/utils/response.py
index 1b4b7a4c56..4d2dd81f8c 100644
--- a/frappe/utils/response.py
+++ b/frappe/utils/response.py
@@ -12,7 +12,7 @@ import frappe.model.utils
 from werkzeug.local import LocalProxy
 
 def report_error(status_code):
-	if status_code!=404:
+	if status_code!=404 or frappe.conf.logging:
 		frappe.errprint(frappe.utils.get_traceback())
 	frappe._response.status_code = status_code
 	if frappe.request_method == "POST":