diff --git a/zaza/openstack/utilities/juju.py b/zaza/openstack/utilities/juju.py
index fd7abc1..9eb38d5 100644
--- a/zaza/openstack/utilities/juju.py
+++ b/zaza/openstack/utilities/juju.py
@@ -92,7 +92,7 @@ def get_machines_for_application(application, model_name=None):
     """
     status = get_application_status(application, model_name=model_name)
     if not status:
-        raise StopIteration
+        return
 
     # libjuju juju status no longer has units for subordinate charms
     # Use the application it is subordinate-to to find machines
diff --git a/zaza/openstack/utilities/openstack.py b/zaza/openstack/utilities/openstack.py
index 1776296..81c61f7 100644
--- a/zaza/openstack/utilities/openstack.py
+++ b/zaza/openstack/utilities/openstack.py
@@ -674,31 +674,35 @@ def configure_gateway_ext_port(novaclient, neutronclient, net_id=None,
     if not net_id:
         net_id = get_admin_net(neutronclient)['id']
 
-    for uuid in uuids:
-        server = novaclient.servers.get(uuid)
-        ext_port_name = "{}_ext-port".format(server.name)
-        for port in neutronclient.list_ports(device_id=server.id)['ports']:
-            if port['name'] == ext_port_name:
-                logging.warning('Neutron Gateway already has additional port')
-                break
-        else:
-            logging.info('Attaching additional port to instance, '
-                         'connected to net id: {}'.format(net_id))
-            body_value = {
-                "port": {
-                    "admin_state_up": True,
-                    "name": ext_port_name,
-                    "network_id": net_id,
-                    "port_security_enabled": False,
+    try:
+        for uuid in uuids:
+            server = novaclient.servers.get(uuid)
+            ext_port_name = "{}_ext-port".format(server.name)
+            for port in neutronclient.list_ports(device_id=server.id)['ports']:
+                if port['name'] == ext_port_name:
+                    logging.warning(
+                        'Neutron Gateway already has additional port')
+                    break
+            else:
+                logging.info('Attaching additional port to instance, '
+                             'connected to net id: {}'.format(net_id))
+                body_value = {
+                    "port": {
+                        "admin_state_up": True,
+                        "name": ext_port_name,
+                        "network_id": net_id,
+                        "port_security_enabled": False,
+                    }
                 }
-            }
-            port = neutronclient.create_port(body=body_value)
-            server.interface_attach(port_id=port['port']['id'],
-                                    net_id=None, fixed_ip=None)
-            if add_dataport_to_netplan:
-                mac_address = get_mac_from_port(port, neutronclient)
-                add_interface_to_netplan(server.name,
-                                         mac_address=mac_address)
+                port = neutronclient.create_port(body=body_value)
+                server.interface_attach(port_id=port['port']['id'],
+                                        net_id=None, fixed_ip=None)
+                if add_dataport_to_netplan:
+                    mac_address = get_mac_from_port(port, neutronclient)
+                    add_interface_to_netplan(server.name,
+                                             mac_address=mac_address)
+    except StopIteration:
+        pass
     ext_br_macs = []
     for port in neutronclient.list_ports(network_id=net_id)['ports']:
         if 'ext-port' in port['name']: