diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 93125193d31..65742d8a784 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -2587,7 +2587,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements
                     if (disk.getDeviceType() == DiskDef.deviceType.CDROM
                             && disk.getDiskPath() != null) {
                         cleanupDisk(conn, disk);
-                    } else if (disk.getDiskPath().contains(vmName + "-patchdisk") 
+                    } else if (disk.getDiskPath() != null 
+                            && disk.getDiskPath().contains(vmName + "-patchdisk") 
                             && vmName.matches("^[rsv]-\\d+-VM$")) {
                         if (!_storagePoolMgr.deleteVbdByPath(disk.getDiskPath())) {
                             s_logger.warn("failed to delete patch disk " + disk.getDiskPath());