diff --git a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
index 67398b29f92..fa346e79b1f 100644
--- a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
+++ b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
@@ -2360,7 +2360,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
 			Iterator<Map.Entry<String, String>> itr = entrySet.iterator();
 			while (itr.hasNext()) {
 				Map.Entry<String, String> entry = itr.next();
-				if (entry.getValue().equalsIgnoreCase(sourceFile)) {
+				if ((entry.getValue() != null) && (entry.getValue().equalsIgnoreCase(sourceFile))) {
 					diskDev = entry.getKey();
 					break;
 				}
diff --git a/agent/src/com/cloud/agent/resource/computing/LibvirtDomainXMLParser.java b/agent/src/com/cloud/agent/resource/computing/LibvirtDomainXMLParser.java
index 779962af0a4..b5271c8e62c 100644
--- a/agent/src/com/cloud/agent/resource/computing/LibvirtDomainXMLParser.java
+++ b/agent/src/com/cloud/agent/resource/computing/LibvirtDomainXMLParser.java
@@ -94,6 +94,8 @@ public class LibvirtDomainXMLParser extends LibvirtXMLParser {
 				} else if (qName.equalsIgnoreCase("disk")) {
 					diskMaps.put(diskDev, diskFile);
 					_disk = false;
+					diskFile = null;
+					diskDev = null;
 				} else if (qName.equalsIgnoreCase("description")) {
 					_desc = false;
 				}