moving code out of try/except that would never trigger NotFound

1 files changed, 3 insertions, 2 deletions

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 9ce0caa46..a0842eeed 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -58,11 +58,12 @@ class Controller(wsgi.Controller):
     def ips(self, req, id):
         try:
             instance = self.compute_api.get(req.environ['nova.context'], id)
-            builder = self._get_addresses_view_builder(req)
-            return builder.build(instance)
         except exception.NotFound:
             return faults.Fault(exc.HTTPNotFound())
 
+        builder = self._get_addresses_view_builder(req)
+        return builder.build(instance)
+
     def index(self, req):
         """ Returns a list of server names and ids for a given user """
         return self._items(req, is_detail=False)