From d02e35e16b56d128c281114b4094ce7ba253a535 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 6 Dec 2012 15:08:07 -0500
Subject: [PATCH] Fix error when hovering way accuracy handles

---
 js/id/renderer/map.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js
index bc6dfd940..8d1239375 100644
--- a/js/id/renderer/map.js
+++ b/js/id/renderer/map.js
@@ -280,17 +280,21 @@ iD.Map = function() {
     }
 
     function hoverIn() {
-        var entity = d3.select(d3.event.target).datum();
-        hover = entity.id;
-        drawVector(iD.util.trueObj([hover]));
-        d3.select('.messages').text(entity.tags.name || '#' + entity.id);
+        var datum = d3.select(d3.event.target).datum();
+        if (datum instanceof iD.Entity) {
+            hover = datum.id;
+            drawVector(iD.util.trueObj([hover]));
+            d3.select('.messages').text(datum.tags.name || '#' + datum.id);
+        }
     }
 
     function hoverOut() {
-        var oldHover = hover;
-        hover = null;
-        drawVector(iD.util.trueObj([oldHover]));
-        d3.select('.messages').text('');
+        if (hover) {
+            var oldHover = hover;
+            hover = null;
+            drawVector(iD.util.trueObj([oldHover]));
+            d3.select('.messages').text('');
+        }
     }
 
     function zoomPan() {