diff --git a/neutron/agent/common/ovs_lib.py b/neutron/agent/common/ovs_lib.py
index 00091c6cc6c..dfedf2f5b7d 100644
--- a/neutron/agent/common/ovs_lib.py
+++ b/neutron/agent/common/ovs_lib.py
@@ -156,8 +156,10 @@ class BaseOVS(object):
     def get_bridges(self):
         return self.ovsdb.list_br().execute(check_error=True)
 
-    def get_bridge_external_bridge_id(self, bridge):
-        return self.ovsdb.br_get_external_id(bridge, 'bridge-id').execute()
+    def get_bridge_external_bridge_id(self, bridge, check_error=False,
+                                      log_errors=True):
+        return self.ovsdb.br_get_external_id(bridge, 'bridge-id').execute(
+            check_error=check_error, log_errors=log_errors)
 
     def set_db_attribute(self, table_name, record, column, value,
                          check_error=False, log_errors=True):
diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
index 812d696b0c4..d55ee5975de 100644
--- a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
@@ -1033,7 +1033,8 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin,
         # bridge-id's configured
         br_names = []
         for bridge in ovs_bridges:
-            bridge_id = ovs.get_bridge_external_bridge_id(bridge)
+            bridge_id = ovs.get_bridge_external_bridge_id(bridge,
+                                                          log_errors=False)
             if bridge_id != bridge:
                 br_names.append(bridge)
         ovs_bridges.difference_update(br_names)
diff --git a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
index 54ca04e35e1..7ed34cd5ac3 100644
--- a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
@@ -2289,7 +2289,7 @@ class AncillaryBridgesTest(object):
     def _test_ancillary_bridges(self, bridges, ancillary):
         device_ids = ancillary[:]
 
-        def pullup_side_effect(*args):
+        def pullup_side_effect(*args, **kwargs):
             # Check that the device_id exists, if it does return it
             # if it does not return None
             try:
diff --git a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_tunnel.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_tunnel.py
index a32fe71c5e5..a0748ccf7bd 100644
--- a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_tunnel.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_tunnel.py
@@ -183,7 +183,8 @@ class TunnelTest(object):
             ovs_lib.BaseOVS,
             'get_bridge_external_bridge_id').start()
         self.get_bridge_external_bridge_id.side_effect = (
-            lambda bridge: bridge if bridge in self.ovs_bridges else None)
+            lambda bridge, log_errors: bridge if bridge in self.ovs_bridges
+            else None)
 
         self.execute = mock.patch('neutron.agent.common.utils.execute').start()