Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java
===================================================================
diff -u -r190c89f5332a6fa6da4d16fd4e0eb668a6d930f7 -rf9906f0846542026549f8e9cb1bc93adfd985852
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 190c89f5332a6fa6da4d16fd4e0eb668a6d930f7)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision f9906f0846542026549f8e9cb1bc93adfd985852)
@@ -407,12 +407,12 @@
 	    }
 	} catch (Exception e) {
 	    // any upload exception will display as normal error message rather then throw exception directly
-	    errorMap.add("GLOBAL", "error.upload.failed");
+	    errorMap.add("GLOBAL", messageService.getMessage(ImageGalleryConstants.ERROR_MSG_UPLOAD_FAILED,
+		    new Object[] { e.getMessage() }));
 	}
 
 	if (!errorMap.isEmpty()) {
 	    request.setAttribute("errorMap", errorMap);
-	    ;
 	    return "pages/authoring/parts/addimage";
 	}
 
@@ -502,7 +502,8 @@
 	    }
 	} catch (Exception e) {
 	    // any upload exception will display as normal error message rather then throw exception directly
-	    errorMap.add("GLOBAL", messageService.getMessage("error.upload.failed"));
+	    errorMap.add("GLOBAL", messageService.getMessage(ImageGalleryConstants.ERROR_MSG_UPLOAD_FAILED,
+		    new Object[] { e.getMessage() }));
 	}
 
 	if (!errorMap.isEmpty()) {
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java
===================================================================
diff -u -r190c89f5332a6fa6da4d16fd4e0eb668a6d930f7 -rf9906f0846542026549f8e9cb1bc93adfd985852
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java	(.../LearningController.java)	(revision 190c89f5332a6fa6da4d16fd4e0eb668a6d930f7)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java	(.../LearningController.java)	(revision f9906f0846542026549f8e9cb1bc93adfd985852)
@@ -268,7 +268,8 @@
 	    }
 	} catch (Exception e) {
 	    // any upload exception will display as normal error message rather then throw exception directly
-	    errorMap.add("GLOBAL", messageService.getMessage("error.upload.failed"));
+	    errorMap.add("GLOBAL", messageService.getMessage(ImageGalleryConstants.ERROR_MSG_UPLOAD_FAILED,
+		    new Object[] { e.getMessage() }));
 	}
 
 	if (!errorMap.isEmpty()) {
@@ -308,7 +309,8 @@
 	    }
 	} catch (Exception e) {
 	    // any upload exception will display as normal error message rather then throw exception directly
-	    errorMap.add("GLOBAL", messageService.getMessage("error.upload.failed"));
+	    errorMap.add("GLOBAL", messageService.getMessage(ImageGalleryConstants.ERROR_MSG_UPLOAD_FAILED,
+		    new Object[] { e.getMessage() }));
 	}
 
 	if (!errorMap.isEmpty()) {
@@ -420,8 +422,7 @@
 	Long sessionId = (Long) sessionMap.get(ImageGalleryConstants.ATTR_TOOL_SESSION_ID);
 	Long imageUid = WebUtil.readLongParam(request, ImageGalleryConstants.PARAM_IMAGE_UID);
 	UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
-	ImageGalleryUser imageGalleryUser = igService.getUserByIDAndSession(user.getUserID().longValue(),
-		sessionId);
+	ImageGalleryUser imageGalleryUser = igService.getUserByIDAndSession(user.getUserID().longValue(), sessionId);
 
 	// persist ImageGalleryItem changes in DB
 	boolean formVote = imageRatingForm.getVote();
@@ -508,8 +509,7 @@
 	HttpSession ss = SessionManager.getSession();
 	// get back login user DTO
 	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-	ImageGalleryUser imageGalleryUser = service.getUserByIDAndSession(user.getUserID().longValue(),
-		sessionId);
+	ImageGalleryUser imageGalleryUser = service.getUserByIDAndSession(user.getUserID().longValue(), sessionId);
 
 	if (imageGalleryUser == null) {
 	    ImageGallerySession session = service.getImageGallerySessionBySessionId(sessionId);