Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java
===================================================================
diff -u -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -ra036f4daff29fff35a950c2ddd63a36078f87e73
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java	(.../TaskListServiceImpl.java)	(revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java	(.../TaskListServiceImpl.java)	(revision a036f4daff29fff35a950c2ddd63a36078f87e73)
@@ -313,7 +313,7 @@
 
 	List<TaskListSession> sessionList = taskListSessionDao.getByContentId(contentId);
 
-	List<SessionDTO> summaryList = new ArrayList<SessionDTO>();
+	List<SessionDTO> summaryList = new ArrayList<>();
 
 	// create the user list of all whom were started this task
 	for (TaskListSession session : sessionList) {
@@ -352,7 +352,7 @@
 
     @Override
     public List<ReflectDTO> getReflectList(Long contentId) {
-	List<ReflectDTO> reflectList = new LinkedList<ReflectDTO>();
+	List<ReflectDTO> reflectList = new LinkedList<>();
 
 	List<TaskListSession> sessionList = taskListSessionDao.getByContentId(contentId);
 	for (TaskListSession session : sessionList) {
@@ -462,12 +462,12 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
-    
+
     @Override
     public void auditLogStartEditingActivityInMonitor(long toolContentID) {
-    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
     }
-    
+
     @Override
     public boolean isLastActivity(Long toolSessionId) {
 	return toolService.isLastActivity(toolSessionId);
@@ -855,12 +855,12 @@
     public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) {
 	return taskListOutputFactory.getToolOutput(name, this, toolSessionId, learnerId);
     }
-    
+
     @Override
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
-	return new ArrayList<ToolOutput>();
+	return new ArrayList<>();
     }
-    
+
     @Override
     public List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId) {
 	return null;
@@ -910,7 +910,7 @@
 
 	// create the list containing all taskListItems
 	TaskList taskList = taskListDao.getByContentId(contentId);
-	ArrayList<TaskListItem> itemList = new ArrayList<TaskListItem>();
+	ArrayList<TaskListItem> itemList = new ArrayList<>();
 	itemList.addAll(taskList.getTaskListItems());
 
 	List<TaskListSession> sessionList = taskListSessionDao.getByContentId(contentId);
@@ -925,7 +925,7 @@
 
 	List<TaskListUser> userList = taskListUserDao.getBySessionID(sessionId);
 
-	ArrayList<TaskListItem> groupItemList = new ArrayList<TaskListItem>();
+	ArrayList<TaskListItem> groupItemList = new ArrayList<>();
 	for (TaskListItem item : itemList) {
 
 	    if (item.isCreateByAuthor()) {
@@ -959,13 +959,17 @@
 	    try {
 		node = taskListToolContentHandler.uploadFile(file.getInputStream(), fileName, file.getContentType());
 	    } catch (InvalidParameterException e) {
-		throw new UploadTaskListFileException(messageService.getMessage("error.msg.invaid.param.upload"));
+		throw new UploadTaskListFileException(
+			messageService.getMessage("error.msg.invaid.param.upload") + " " + e.getMessage());
 	    } catch (FileNotFoundException e) {
-		throw new UploadTaskListFileException(messageService.getMessage("error.msg.file.not.found"));
+		throw new UploadTaskListFileException(
+			messageService.getMessage("error.msg.file.not.found") + " " + e.getMessage());
 	    } catch (RepositoryCheckedException e) {
-		throw new UploadTaskListFileException(messageService.getMessage("error.msg.repository"));
+		throw new UploadTaskListFileException(
+			messageService.getMessage("error.msg.repository") + " " + e.getMessage());
 	    } catch (IOException e) {
-		throw new UploadTaskListFileException(messageService.getMessage("error.msg.io.exception"));
+		throw new UploadTaskListFileException(
+			messageService.getMessage("error.msg.io.exception") + " " + e.getMessage());
 	    }
 	}
 	return node;
@@ -979,7 +983,7 @@
     public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) {
 	return getTaskListOutputFactory().getSupportedDefinitionClasses(definitionType);
     }
-    
+
     @Override
     public ToolCompletionStatus getCompletionStatus(Long learnerId, Long toolSessionId) {
 	TaskListUser learner = getUserByIDAndSession(learnerId, toolSessionId);
@@ -988,11 +992,11 @@
 	}
 
 	Object[] dates = getTaskListItemVisitDao().getDateRangeOfTasks(learner.getUid(), toolSessionId);
-	if (learner.isSessionFinished())
-	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_COMPLETED, (Date)dates[0], (Date)dates[1]);
-	else
-	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_ATTEMPTED,(Date) dates[0], null);
+	if (learner.isSessionFinished()) {
+	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_COMPLETED, (Date) dates[0], (Date) dates[1]);
+	} else {
+	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_ATTEMPTED, (Date) dates[0], null);
+	}
     }
 
-
 }
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java
===================================================================
diff -u -raff1ef425c76fe6a2051694c0fdf833265459710 -ra036f4daff29fff35a950c2ddd63a36078f87e73
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java	(.../LearningController.java)	(revision aff1ef425c76fe6a2051694c0fdf833265459710)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java	(.../LearningController.java)	(revision a036f4daff29fff35a950c2ddd63a36078f87e73)
@@ -444,7 +444,7 @@
 	Set<TaskListItemComment> dbComments = dbItem.getComments();
 	dbComments.add(comment);
 	taskListService.saveOrUpdateTaskListItem(dbItem);
-	
+
 	TasListItemDTO itemDTO = new TasListItemDTO(dbItem);
 	itemDTO.setCommentRequirementsMet(true);
 	request.setAttribute("itemDTO", itemDTO);
@@ -498,7 +498,14 @@
 	// upload to repository
 	UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
 	TaskListUser taskListUser = taskListService.getUserByIDAndSession(user.getUserID().longValue(), sessionId);
-	TaskListItemAttachment att = taskListService.uploadTaskListItemFile(file, taskListUser);
+	TaskListItemAttachment att = null;
+	try {
+	    att = taskListService.uploadTaskListItemFile(file, taskListUser);
+	} catch (UploadTaskListFileException e) {
+	    errorMap.add("GLOBAL", messageService.getMessage("error.upload.failed", new Object[] { e.getMessage() }));
+	    request.setAttribute("errorMap", errorMap);
+	    return "pages/learning/learning";
+	}
 
 	// persist TaskListItem changes in DB
 	Long itemUid = WebUtil.readLongParam(request, TaskListConstants.PARAM_ITEM_UID);
@@ -540,7 +547,8 @@
 
 	// get the existing reflection entry
 
-	SessionMap<String, Object> sessionMap = getSessionMap(request);;
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
+	;
 	Long toolSessionID = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 	NotebookEntry entry = taskListService.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL,
 		TaskListConstants.TOOL_SIGNATURE, user.getUserID());
@@ -652,7 +660,7 @@
 	Long sessionId = (Long) sessionMap.get(TaskListConstants.ATTR_TOOL_SESSION_ID);
 	taskListService.setItemComplete(taskListItemUid, user.getUserID().longValue(), sessionId);
     }
-    
+
     @SuppressWarnings("unchecked")
     private SessionMap<String, Object> getSessionMap(HttpServletRequest request) {
 	String sessionMapID = WebUtil.readStrParam(request, TaskListConstants.ATTR_SESSION_MAP_ID);