diff --git a/lib/OpenLayers/Renderer.js b/lib/OpenLayers/Renderer.js
index a1b1a92342..bc4ac12cdb 100644
--- a/lib/OpenLayers/Renderer.js
+++ b/lib/OpenLayers/Renderer.js
@@ -302,7 +302,7 @@ OpenLayers.Renderer = OpenLayers.Class({
      * evt - {<OpenLayers.Event>} 
      *
      * Returns:
-     * {String} A feature id or null.
+     * {String} A feature id or undefined.
      */
     getFeatureIdFromEvent: function(evt) {},
     
diff --git a/lib/OpenLayers/Renderer/Canvas.js b/lib/OpenLayers/Renderer/Canvas.js
index a9a87bb788..e6883a86ca 100644
--- a/lib/OpenLayers/Renderer/Canvas.js
+++ b/lib/OpenLayers/Renderer/Canvas.js
@@ -626,12 +626,12 @@ OpenLayers.Renderer.Canvas = OpenLayers.Class(OpenLayers.Renderer, {
      * evt - {<OpenLayers.Event>} 
      *
      * Returns:
-     * {<OpenLayers.Feature.Vector} A feature or null.  This method returns a 
+     * {<OpenLayers.Feature.Vector} A feature or undefined.  This method returns a 
      *     feature instead of a feature id to avoid an unnecessary lookup on the
      *     layer.
      */
     getFeatureIdFromEvent: function(evt) {
-        var feature = null;
+        var feature;
         if (this.hitDetection) {
             // this dragging check should go in the feature handler
             if (!this.map.dragging) {
diff --git a/lib/OpenLayers/Renderer/Elements.js b/lib/OpenLayers/Renderer/Elements.js
index af5234eaf6..72f5ca659e 100644
--- a/lib/OpenLayers/Renderer/Elements.js
+++ b/lib/OpenLayers/Renderer/Elements.js
@@ -885,15 +885,13 @@ OpenLayers.Renderer.Elements = OpenLayers.Class(OpenLayers.Renderer, {
      * evt - {Object} An <OpenLayers.Event> object
      *
      * Returns:
-     * {<OpenLayers.Geometry>} A geometry from an event that 
-     *     happened on a layer.
+     * {String} A feature id or undefined.
      */
     getFeatureIdFromEvent: function(evt) {
         var target = evt.target;
         var useElement = target && target.correspondingUseElement;
         var node = useElement ? useElement : (target || evt.srcElement);
-        var featureId = node._featureId;
-        return featureId;
+        return node._featureId;
     },
 
     /** 
diff --git a/lib/OpenLayers/Renderer/SVG.js b/lib/OpenLayers/Renderer/SVG.js
index 132c12c7d3..b60b75a57b 100644
--- a/lib/OpenLayers/Renderer/SVG.js
+++ b/lib/OpenLayers/Renderer/SVG.js
@@ -920,15 +920,14 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, {
      * evt - {Object} An <OpenLayers.Event> object
      *
      * Returns:
-     * {<OpenLayers.Geometry>} A geometry from an event that 
-     *     happened on a layer.
+     * {String} A feature id or undefined.
      */
     getFeatureIdFromEvent: function(evt) {
         var featureId = OpenLayers.Renderer.Elements.prototype.getFeatureIdFromEvent.apply(this, arguments);
         if(!featureId) {
             var target = evt.target;
-            featureId = target.parentNode && target != this.rendererRoot &&
-                target.parentNode._featureId;
+            featureId = target.parentNode && target != this.rendererRoot ?
+                target.parentNode._featureId : undefined;
         }
         return featureId;
     },
diff --git a/lib/OpenLayers/Renderer/SVG2.js b/lib/OpenLayers/Renderer/SVG2.js
index 628ed9504e..7dd179ef04 100644
--- a/lib/OpenLayers/Renderer/SVG2.js
+++ b/lib/OpenLayers/Renderer/SVG2.js
@@ -732,15 +732,14 @@ OpenLayers.Renderer.SVG2 = OpenLayers.Class(OpenLayers.Renderer.NG, {
      * evt - {Object} An <OpenLayers.Event> object
      *
      * Returns:
-     * {<OpenLayers.Geometry>} A geometry from an event that 
-     *     happened on a layer.
+     * {String} A feature id or undefined.
      */
     getFeatureIdFromEvent: function(evt) {
         var featureId = OpenLayers.Renderer.Elements.prototype.getFeatureIdFromEvent.apply(this, arguments);
         if(!featureId) {
             var target = evt.target;
-            featureId = target.parentNode && target != this.rendererRoot &&
-                target.parentNode._featureId;
+            featureId = target.parentNode && target != this.rendererRoot ?
+                target.parentNode._featureId : undefined;
         }
         return featureId;
     },