diff --git a/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js b/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js
index 48237917d3f..239b7e4e19d 100644
--- a/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js
+++ b/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js
@@ -31,15 +31,17 @@ frappe.ui.form.on('Assessment Result Tool', {
 					"student_group": frm.doc.student_group
 				},
 				callback: function(r) {
-					frm.doc.students = r.message;
-					frm.events.render_table(frm);
-					for (let value of r.message) {
-						if (!value.docstatus) {
-							frm.doc.show_submit = true;
-							break;
+					if (r.message) {
+						frm.doc.students = r.message;
+						frm.events.render_table(frm);
+						for (let value of r.message) {
+							if (!value.docstatus) {
+								frm.doc.show_submit = true;
+								break;
+							}
 						}
+						frm.events.submit_result(frm);
 					}
-					frm.events.submit_result(frm);
 				}
 			});
 		}
diff --git a/erpnext/public/js/schools/assessment_result_tool.html b/erpnext/public/js/education/assessment_result_tool.html
similarity index 100%
rename from erpnext/public/js/schools/assessment_result_tool.html
rename to erpnext/public/js/education/assessment_result_tool.html
diff --git a/erpnext/public/js/schools/student_button.html b/erpnext/public/js/education/student_button.html
similarity index 100%
rename from erpnext/public/js/schools/student_button.html
rename to erpnext/public/js/education/student_button.html