diff --git a/zun/volume/cinder_api.py b/zun/volume/cinder_api.py
index be7784eef..ee2064fd4 100644
--- a/zun/volume/cinder_api.py
+++ b/zun/volume/cinder_api.py
@@ -42,7 +42,10 @@ class CinderAPI(object):
 
     def search_volume(self, volume):
         if uuidutils.is_uuid_like(volume):
-            volume = self.cinder.volumes.get(volume)
+            try:
+                volume = self.cinder.volumes.get(volume)
+            except cinder_exception.NotFound:
+                raise exception.VolumeNotFound(volume=volume)
         else:
             try:
                 volume = self.cinder.volumes.find(name=volume)