Index: lams_tool_gmap/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.25 -r1.25.6.1
--- lams_tool_gmap/conf/language/lams/ApplicationResources.properties	24 Nov 2008 01:11:39 -0000	1.25
+++ lams_tool_gmap/conf/language/lams/ApplicationResources.properties	14 May 2009 00:30:58 -0000	1.25.6.1
@@ -119,6 +119,6 @@
 message.alertContentEdit  =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information.
 button.fitMarkers  =Fit All Markers in Map
 label.unsavedMarkers  =You have one or more markers on the map without a title, if you continue these markers will not be saved. Do you want to continue anyway?
+label.nogroups  =No groups found for activity.
 
-
 #======= End labels: Exported 113 labels for en AU =====
Index: lams_tool_gmap/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.21 -r1.21.6.1
--- lams_tool_gmap/conf/language/lams/ApplicationResources_en_AU.properties	24 Nov 2008 01:11:39 -0000	1.21
+++ lams_tool_gmap/conf/language/lams/ApplicationResources_en_AU.properties	14 May 2009 00:30:58 -0000	1.21.6.1
@@ -119,6 +119,6 @@
 message.alertContentEdit  =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information.
 button.fitMarkers  =Fit All Markers in Map
 label.unsavedMarkers  =You have one or more markers on the map without a title, if you continue these markers will not be saved. Do you want to continue anyway?
+label.nogroups  =No groups found for activity.
 
-
 #======= End labels: Exported 113 labels for en AU =====
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java,v
diff -u -r1.10 -r1.10.4.1
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java	16 Jan 2009 04:36:43 -0000	1.10
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java	14 May 2009 00:30:58 -0000	1.10.4.1
@@ -89,22 +89,25 @@
 	GmapDTO gmapDT0 = new GmapDTO(gmap);
 
 	// Adding the markers lists to a map with tool sessions as the key
-	//Map<Long, Set<GmapMarkerDTO> > sessionMarkersMap = new HashMap<Long, Set<GmapMarkerDTO> >();
-	for (GmapSessionDTO sessionDTO : gmapDT0.getSessionDTOs()) {
-	    Long toolSessionID = sessionDTO.getSessionID();
-	    sessionDTO.setMarkerDTOs(gmapService.getGmapMarkersBySessionId(toolSessionID));
 
-	    for (GmapUserDTO userDTO : sessionDTO.getUserDTOs()) {
-		// get the notebook entry.
-		NotebookEntry notebookEntry = gmapService.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL,
-			GmapConstants.TOOL_SIGNATURE, userDTO.getUserId().intValue());
-		if (notebookEntry != null) {
-		    userDTO.setFinishedReflection(true);
-		    //userDTO.setNotebookEntry(notebookEntry.getEntry());
-		} else {
-		    userDTO.setFinishedReflection(false);
+	if (gmapDT0.getSessionDTOs() != null) {
+	    for (GmapSessionDTO sessionDTO : gmapDT0.getSessionDTOs()) {
+		Long toolSessionID = sessionDTO.getSessionID();
+		sessionDTO.setMarkerDTOs(gmapService.getGmapMarkersBySessionId(toolSessionID));
+
+		for (GmapUserDTO userDTO : sessionDTO.getUserDTOs()) {
+		    // get the notebook entry.
+		    NotebookEntry notebookEntry = gmapService.getEntry(toolSessionID,
+			    CoreNotebookConstants.NOTEBOOK_TOOL, GmapConstants.TOOL_SIGNATURE, userDTO.getUserId()
+				    .intValue());
+		    if (notebookEntry != null) {
+			userDTO.setFinishedReflection(true);
+			//userDTO.setNotebookEntry(notebookEntry.getEntry());
+		    } else {
+			userDTO.setFinishedReflection(false);
+		    }
+		    sessionDTO.getUserDTOs().add(userDTO);
 		}
-		sessionDTO.getUserDTOs().add(userDTO);
 	    }
 	}
 
Index: lams_tool_gmap/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/pages/monitoring/summary.jsp,v
diff -u -r1.19.6.1 -r1.19.6.2
--- lams_tool_gmap/web/pages/monitoring/summary.jsp	15 Apr 2009 03:07:26 -0000	1.19.6.1
+++ lams_tool_gmap/web/pages/monitoring/summary.jsp	14 May 2009 00:30:58 -0000	1.19.6.2
@@ -195,7 +195,7 @@
 	</tr>
 	
 	<c:if test="${empty dto.sessionDTOs}">
-		<td><i>No groups found for lesson.</i></td>
+		<td colspan="2"><i><fmt:message key="label.nogroups" /></i></td>
 	</c:if>
 	<c:forEach var="session" items="${dto.sessionDTOs}">
 		<tr>