diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 6ad6c040623bba7b5af9660f7f67d1f1c9b96aec..a3150b199671abe2920f698e78aa46b91f87d1ac 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -5297,7 +5297,7 @@ class LUReplaceDisks(LogicalUnit):
       try:
         _CreateSingleBlockDev(self, new_node, instance, new_drbd,
                               _GetInstanceInfoText(instance), False)
-      except errors.BlockDeviceError:
+      except errors.GenericError:
         self.cfg.ReleaseDRBDMinors(instance.name)
         raise