Merge from trunk

1 files changed, 1 insertions, 1 deletions

diff --git a/bin/nova-manage b/bin/nova-manage
index 2f6af6e2d..a36ec86d0 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -972,7 +972,7 @@ class ImageCommands(object):
         try:
             internal_id = ec2utils.ec2_id_to_id(old_image_id)
             image = self.image_service.show(context, internal_id)
-        except exception.NotFound:
+        except (exception.InvalidEc2Id, exception.ImageNotFound):
             image = self.image_service.show_by_name(context, old_image_id)
         return image['id']