Index: lams_tool_lamc/web/common/messages.jsp
===================================================================
diff -u -r00937d78dacc0993260d5ed7b39e4376e432cf45 -r424f8d213bbff9badfb9b913fd7c68d5cc1d5c3d
--- lams_tool_lamc/web/common/messages.jsp	(.../messages.jsp)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
+++ lams_tool_lamc/web/common/messages.jsp	(.../messages.jsp)	(revision 424f8d213bbff9badfb9b913fd7c68d5cc1d5c3d)
@@ -1,14 +1,15 @@
-<%-- Error Messages --%>
-<logic:messagesPresent>
-    <div class="error" id="errorMessages">
-       	<lams:Alert id="errorMessages" type="danger" close="false">
-	        <html:messages id="error">
-            	<c:out value="${error}" escapeXml="false"/><br/>
- 	       </html:messages>
-        </lams:Alert>
-   </div>
-</logic:messagesPresent>
+<%@include file="/common/taglibs.jsp"%>
 
+<%-- Error Messages --%>
+ <c:set var="errorKey" value="GLOBAL" />
+        <c:if test="${not empty errorMap and not empty errorMap[errorKey]}">
+            <lams:Alert id="error" type="danger" close="false">
+                <c:forEach var="error" items="${errorMap[errorKey]}">
+                    <c:out value="${error}" />
+                </c:forEach>
+            </lams:Alert>
+        </c:if>
+        
 <%-- Success Messages --%>
 <logic:messagesPresent message="true">
     <div class="message" id="successMessages">