Index: lams_tool_gmap/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rbaf5d2db55e5db78d24d07464b301c0568762607 -r66fd0a0bbc39ea3aa52ec79313f68e10a7d3095f
--- lams_tool_gmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision baf5d2db55e5db78d24d07464b301c0568762607)
+++ lams_tool_gmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 66fd0a0bbc39ea3aa52ec79313f68e10a7d3095f)
@@ -7,10 +7,10 @@
 #=================== labels for Gmap =================# 
 
 tool.display.name  =Gmap
-tool.description  =Google Map Tool
+tool.description  =Google Mapping Tool
 activity.title  =Gmap 
-activity.description  =Google Map Tool
-activity.helptext  =Google Map Tool
+activity.description  =Google Mapping Tool
+activity.helptext  =Google Mapping Tool
 pageTitle.authoring  =Gmap Authoring
 button.basic  =Basic
 button.advanced  =Advanced
@@ -99,6 +99,7 @@
 
 message.alertContentEdit  =Warning: One of more students have accessed this activity. Changing this content will result in students getting different information.
 error.cantLoadMap =Could not load map.
+error.gmapKeyMissing  =LAMS does not have a Google Maps API key set up, please contact your system administrator.
 
 
 #======= End labels: Exported 76 labels for en AU =====
Index: lams_tool_gmap/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -reefe7f40e2ef0c0036f1d083f32560976e74c45a -r66fd0a0bbc39ea3aa52ec79313f68e10a7d3095f
--- lams_tool_gmap/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision eefe7f40e2ef0c0036f1d083f32560976e74c45a)
+++ lams_tool_gmap/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 66fd0a0bbc39ea3aa52ec79313f68e10a7d3095f)
@@ -7,9 +7,10 @@
 #=================== labels for Gmap =================# 
 
 tool.display.name  =Gmap
-tool.description  =Gmap Tool
-activity.title  =Gmap
-activity.description  =Gmap Tool
+tool.description  =Google Mapping Tool
+activity.title  =Gmap 
+activity.description  =Google Mapping Tool
+activity.helptext  =Google Mapping Tool
 pageTitle.authoring  =Gmap Authoring
 button.basic  =Basic
 button.advanced  =Advanced
@@ -98,6 +99,7 @@
 
 message.alertContentEdit  =Warning: One of more students have accessed this activity. Changing this content will result in students getting different information.
 error.cantLoadMap =Could not load map.
+error.gmapKeyMissing  =LAMS does not have a Google Maps API key set up, please contact your system administrator.
 
 
 #======= End labels: Exported 76 labels for en AU =====
Index: lams_tool_gmap/conf/language/rams/ApplicationResources.properties
===================================================================
diff -u -reefe7f40e2ef0c0036f1d083f32560976e74c45a -r66fd0a0bbc39ea3aa52ec79313f68e10a7d3095f
--- lams_tool_gmap/conf/language/rams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision eefe7f40e2ef0c0036f1d083f32560976e74c45a)
+++ lams_tool_gmap/conf/language/rams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 66fd0a0bbc39ea3aa52ec79313f68e10a7d3095f)
@@ -7,9 +7,10 @@
 #=================== labels for Gmap =================# 
 
 tool.display.name  =Gmap
-tool.description  =Gmap Tool
-activity.title  =Gmap
-activity.description  =Gmap Tool
+tool.description  =Google Mapping Tool
+activity.title  =Gmap 
+activity.description  =Google Mapping Tool
+activity.helptext  =Google Mapping Tool
 pageTitle.authoring  =Gmap Authoring
 button.basic  =Basic
 button.advanced  =Advanced
@@ -98,6 +99,7 @@
 
 message.alertContentEdit  =Warning: One of more students have accessed this activity. Changing this content will result in students getting different information.
 error.cantLoadMap =Could not load map.
+error.gmapKeyMissing  =LAMS does not have a Google Maps API key set up, please contact your system administrator.
 
 
 #======= End labels: Exported 76 labels for en AU =====
Index: lams_tool_gmap/conf/language/rams/ApplicationResources_en_AU.properties
===================================================================
diff -u -reefe7f40e2ef0c0036f1d083f32560976e74c45a -r66fd0a0bbc39ea3aa52ec79313f68e10a7d3095f
--- lams_tool_gmap/conf/language/rams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision eefe7f40e2ef0c0036f1d083f32560976e74c45a)
+++ lams_tool_gmap/conf/language/rams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 66fd0a0bbc39ea3aa52ec79313f68e10a7d3095f)
@@ -7,9 +7,10 @@
 #=================== labels for Gmap =================# 
 
 tool.display.name  =Gmap
-tool.description  =Gmap Tool
-activity.title  =Gmap
-activity.description  =Gmap Tool
+tool.description  =Google Mapping Tool
+activity.title  =Gmap 
+activity.description  =Google Mapping Tool
+activity.helptext  =Google Mapping Tool
 pageTitle.authoring  =Gmap Authoring
 button.basic  =Basic
 button.advanced  =Advanced
@@ -98,6 +99,7 @@
 
 message.alertContentEdit  =Warning: One of more students have accessed this activity. Changing this content will result in students getting different information.
 error.cantLoadMap =Could not load map.
+error.gmapKeyMissing  =LAMS does not have a Google Maps API key set up, please contact your system administrator.
 
 
 #======= End labels: Exported 76 labels for en AU =====
Index: lams_tool_gmap/web/includes/jsp/mapFunctions.jsp
===================================================================
diff -u -r5ce30aa8ffc2842d20d1f3832617385e34f17e33 -r66fd0a0bbc39ea3aa52ec79313f68e10a7d3095f
--- lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(.../mapFunctions.jsp)	(revision 5ce30aa8ffc2842d20d1f3832617385e34f17e33)
+++ lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(.../mapFunctions.jsp)	(revision 66fd0a0bbc39ea3aa52ec79313f68e10a7d3095f)
@@ -6,19 +6,30 @@
 	<lams:WebAppURL />
 </c:set>
 
+<c:set var="gmapKey">
+	<%= Configuration.get(ConfigurationKeys.GMAP_KEY) %>
+</c:set>
 
+<c:choose>
+	<c:when test="${gmapKey != ''}">
+		<script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=<%= Configuration.get(ConfigurationKeys.GMAP_KEY) %>" type="text/javascript"></script>
+	</c:when>
+	<c:otherwise>
+		<script type="text/javascript">	
+		<!--
+			alert("<fmt:message key='error.gmapKeyMissing'/>");
+		-->
+		</script>
+	</c:otherwise>
+</c:choose>
 
-<script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=<%= Configuration.get(ConfigurationKeys.GMAP_KEY) %>" type="text/javascript"></script>
-
-
 <script type="text/javascript">
 <!--
 
 var selectedUser = -1;
 var selectedMarker = -1;
 var currentOpenMarkerImportance= 0;
 
-
 // add a marker at the given point
 function addMarker(point, infoMessage, title, uid, isSaved, editAble, createdBy, createdById)
 {
@@ -370,14 +381,5 @@
 	return true;
 }
 
-
-
-
-
-function test()
-{
-	serialiseMarkers();
-	alert(document.getElementById("markersXML").value);
-}
 //-->
 </script>
\ No newline at end of file