diff --git a/client/galaxy/scripts/mvc/workflow/workflow-connector.js b/client/galaxy/scripts/mvc/workflow/workflow-connector.js
index e472c7cdc62..c2863b93793 100644
--- a/client/galaxy/scripts/mvc/workflow/workflow-connector.js
+++ b/client/galaxy/scripts/mvc/workflow/workflow-connector.js
@@ -43,8 +43,8 @@ $.extend(Connector.prototype, {
                 this.canvas.style.zIndex = "300";
             }
         }
-        this.canvas.setAttribute("handle1-id", handle1 ? handle1.element.getAttribute("id") : "");
-        this.canvas.setAttribute("handle2-id", handle2 ? handle2.element.getAttribute("id") : "");
+        this.canvas.setAttribute("handle1-id", handle1 && handle1.element.getAttribute ? handle1.element.getAttribute("id") : "");
+        this.canvas.setAttribute("handle2-id", handle2 && handle2.element.getAttribute ? handle2.element.getAttribute("id") : "");
         var relativeLeft = e => $(e).offset().left - canvas_container.offset().left;
         var relativeTop = e => $(e).offset().top - canvas_container.offset().top;
         if (!handle1 || !handle2) {
diff --git a/test/selenium_tests/test_workflow_editor.py b/test/selenium_tests/test_workflow_editor.py
index 8ac2825047e..e9badc4f471 100644
--- a/test/selenium_tests/test_workflow_editor.py
+++ b/test/selenium_tests/test_workflow_editor.py
@@ -26,7 +26,7 @@ class WorkflowEditorTestCase(SeleniumTestCase):
 
         name = self.workflow_create_new()
         editor.canvas_body.wait_for_visible()
-        menu_element = editor.tool_menu.wait_for_visible()
+        editor.tool_menu.wait_for_visible()
         editor.tool_menu_section_link(section_name="inputs").wait_for_and_click()
         editor.tool_menu_item_link(section_name="inputs", item_name="data_input").wait_for_and_click()
         self.screenshot("workflow_editor_data_input_new")
@@ -53,7 +53,7 @@ class WorkflowEditorTestCase(SeleniumTestCase):
 
         name = self.workflow_create_new()
         editor.canvas_body.wait_for_visible()
-        menu_element = editor.tool_menu.wait_for_visible()
+        editor.tool_menu.wait_for_visible()
         editor.tool_menu_section_link(section_name="inputs").wait_for_and_click()
         editor.tool_menu_item_link(section_name="inputs", item_name="data_collection_input").wait_for_and_click()
         self.screenshot("workflow_editor_data_input_collection_new")