diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 6f1c0012a608..14feef93ae8b 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -2095,7 +2095,9 @@ class ComputeManager(manager.Manager):
                 # Make sure the async call finishes
                 if network_info is not None:
                     network_info.wait(do_raise=False)
-        except exception.UnexpectedTaskStateError as e:
+        except (exception.UnexpectedTaskStateError,
+                exception.VolumeLimitExceeded,
+                exception.InvalidBDM) as e:
             # Make sure the async call finishes
             if network_info is not None:
                 network_info.wait(do_raise=False)