--- includes/behaviors/js/openlayers_behavior_tooltip.js	Thu Feb 04 02:13:45 2010
+++ includes/behaviors/js/openlayers_behavior_tooltip.js	Sat Jun 12 16:30:59 2010
@@ -12,9 +12,20 @@
  *  Formatted HTML
  */
 function openlayers_behavior_tooltip_popup_content(feature) {
-  return "<div class='openlayers-popup'>" + feature.attributes.name +"</div>" +
-         "<div class='openlayers-popup'>" + feature.attributes.description +"</div>";
+  var content = "<div class='openlayers-popup'>" ;
+  if (typeof feature.attributes.name != "undefined")
+  { 
+    content += feature.attributes.name ;
 }
+  content += "</div>" + "<div class='openlayers-popup'>" ;
+  if (typeof feature.attributes.description != "undefined")
+  { 
+    content += feature.attributes.description ;
+  } 
+  content += "</div>";
+  return content;
+}
+
 
 
 /**