Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java
===================================================================
diff -u -r9bd48180632126e711896a486782d581e2e78750 -r822db036e49dc8b8958207288d76c601be1f3d13
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 9bd48180632126e711896a486782d581e2e78750)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 822db036e49dc8b8958207288d76c601be1f3d13)
@@ -372,7 +372,8 @@
 	    response.getOutputStream().flush();
 	} catch (Exception e) {
 	    logger.error(e);
-	    errorMap.add(messageService.getMessage("monitoring.download.error"), e.toString());
+	    errorMap.add("GLOBAL",
+		    messageService.getMessage("monitoring.download.error", new Object[] { e.toString() }));
 	}
 
 	if (!errorMap.isEmpty()) {
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java
===================================================================
diff -u -r51891afa31c2dcc90ef04fe7976d3fd1fea509f8 -r822db036e49dc8b8958207288d76c601be1f3d13
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 51891afa31c2dcc90ef04fe7976d3fd1fea509f8)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 822db036e49dc8b8958207288d76c601be1f3d13)
@@ -496,7 +496,8 @@
 	} catch (Exception e) {
 	    MonitoringController.log.error(e);
 	    MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
-	    errorMap.add("error.monitoring.export.excel", e.toString());
+	    errorMap.add("GLOBAL",
+		    messageService.getMessage("error.monitoring.export.excel", new Object[] { e.toString() }));
 	    errors = errorMap.toString();
 	}
 
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java
===================================================================
diff -u -r108298de22e3e3cb17e2cf409fca09ae68da8491 -r822db036e49dc8b8958207288d76c601be1f3d13
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 108298de22e3e3cb17e2cf409fca09ae68da8491)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 822db036e49dc8b8958207288d76c601be1f3d13)
@@ -781,9 +781,9 @@
     public String saveOrUpdatePedagogicalPlannerForm(@ModelAttribute TaskListPedagogicalPlannerForm plannerForm,
 	    HttpServletRequest request) throws IOException {
 
-	MultiValueMap<String, String> errorMap = plannerForm.validate();
+	MultiValueMap<String, String> errorMap = plannerForm.validate(messageService);
 
-	if (!errorMap.isEmpty()) {
+	if (errorMap.isEmpty()) {
 	    TaskList taskList = taskListService.getTaskListByContentId(plannerForm.getToolContentID());
 
 	    int itemIndex = 0;