diff --git a/oslo_messaging/_drivers/pool.py b/oslo_messaging/_drivers/pool.py
index 681dbef1e..774c3ab34 100644
--- a/oslo_messaging/_drivers/pool.py
+++ b/oslo_messaging/_drivers/pool.py
@@ -117,7 +117,7 @@ class Pool(object):
                 _, item = self._items.pop()
                 yield item
             except IndexError:
-                raise StopIteration
+                return
 
     @abc.abstractmethod
     def create(self):
diff --git a/oslo_messaging/_drivers/zmq_driver/client/zmq_routing_table.py b/oslo_messaging/_drivers/zmq_driver/client/zmq_routing_table.py
index 458563314..40fc9669a 100644
--- a/oslo_messaging/_drivers/zmq_driver/client/zmq_routing_table.py
+++ b/oslo_messaging/_drivers/zmq_driver/client/zmq_routing_table.py
@@ -170,7 +170,7 @@ class RoutingTable(object):
         hosts, tm_original = self._get_hosts(target_key)
         for host in itertools.cycle(hosts):
             if self._is_target_changed(target_key, tm_original):
-                raise StopIteration()
+                return
             yield host