diff --git a/modules/ui/raw_membership_editor.js b/modules/ui/raw_membership_editor.js
index 4986df3c1..b383271c7 100644
--- a/modules/ui/raw_membership_editor.js
+++ b/modules/ui/raw_membership_editor.js
@@ -26,10 +26,10 @@ export function uiRawMembershipEditor(context) {
         .minItems(1)
         .fetcher(fetchNearbyRelations)
         .itemsMouseEnter(function(d) {
-            utilHighlightEntities([d.relation.id], true, context);
+            if (d.relation) utilHighlightEntities([d.relation.id], true, context);
         })
         .itemsMouseLeave(function(d) {
-            utilHighlightEntities([d.relation.id], false, context);
+            if (d.relation) utilHighlightEntities([d.relation.id], false, context);
         });
     var _inChange = false;
     var _entityID;
@@ -366,7 +366,7 @@ export function uiRawMembershipEditor(context) {
                     return;
                 }
                 // remove hover-higlighting
-                utilHighlightEntities([d.relation.id], false, context);
+                if (d.relation) utilHighlightEntities([d.relation.id], false, context);
 
                 var role = list.selectAll('.member-row-new .member-role').property('value');
                 addMembership(d, role);
@@ -376,7 +376,7 @@ export function uiRawMembershipEditor(context) {
             function cancelEntity() {
                 var input = newMembership.selectAll('.member-entity-input');
                 input.property('value', '');
-                
+
                 // remove hover-higlighting
                 context.surface().selectAll('.highlighted')
                     .classed('highlighted', false);