diff --git a/gmap_plugin_style_gmap.inc b/gmap_plugin_style_gmap.inc
index 99894996d4c8430a292a5dafee955c7fd7613cda..306d538852716328d6e87c8fd779643e015aec93 100644
--- a/gmap_plugin_style_gmap.inc
+++ b/gmap_plugin_style_gmap.inc
@@ -196,8 +196,8 @@ class gmap_plugin_style_gmap extends views_plugin_style {
           }
 
           $tooltip = "";
-          if ($this->options['tooltipenabled'] && $row->$tooltip_field) {
-            $tooltip = $row->$tooltip_field;
+          if ($this->options['tooltipenabled'] && !empty($tooltip_field) && !empty($row->{$tooltip_field})) {
+            $tooltip = $row->{$tooltip_field};
           }
 
           $marker = array(