diff --git a/neutron/plugins/vmware/dhcp_meta/migration.py b/neutron/plugins/vmware/dhcp_meta/migration.py
index 992a88346b..0f1b32b771 100644
--- a/neutron/plugins/vmware/dhcp_meta/migration.py
+++ b/neutron/plugins/vmware/dhcp_meta/migration.py
@@ -58,8 +58,6 @@ class DhcpMetadataBuilder(object):
         for port in ports:
             if port['fixed_ips'][0]['subnet_id'] == subnet['id']:
                 return port['device_id']
-        else:
-            raise n_exc.NotFound()
 
     def metadata_deallocate(self, context, router_id, subnet_id):
         """Deallocate metadata services for the subnet."""
diff --git a/neutron/tests/unit/vmware/test_dhcpmeta.py b/neutron/tests/unit/vmware/test_dhcpmeta.py
index dd43873014..23c4a86cf0 100644
--- a/neutron/tests/unit/vmware/test_dhcpmeta.py
+++ b/neutron/tests/unit/vmware/test_dhcpmeta.py
@@ -71,6 +71,11 @@ class DhcpMetadataBuilderTestCase(base.BaseTestCase):
     def test_router_id_get_none_subnet(self):
         self.assertIsNone(self.builder.router_id_get(mock.ANY, None))
 
+    def test_router_id_get_none_no_router(self):
+        self.builder.plugin.get_ports.return_value = []
+        subnet = {'network_id': self.network_id}
+        self.assertIsNone(self.builder.router_id_get(mock.ANY, subnet))
+
     def test_metadata_deallocate(self):
         self.builder.metadata_deallocate(
             mock.ANY, self.router_id, self.subnet_id)