--- XendDomainInfo.py	2006-08-17 17:17:46.000000000 -0400
+++ XendDomainInfo.py.new	2006-08-18 15:42:18.000000000 -0400
@@ -1078,7 +1078,13 @@
     ## public:
 
     def destroyDevice(self, deviceClass, devid):
-        return self.getDeviceController(deviceClass).destroyDevice(devid)
+	try:
+	    return self.getDeviceController(deviceClass).destroyDevice(devid)
+	except VmError:
+	    if deviceClass == 'vbd':
+		return self.getDeviceController('tap').destroyDevice(devid)
+	    else:
+		raise
 
 
     def getDeviceSxprs(self, deviceClass):