1 files changed, 2 insertions, 2 deletions
diff --git a/image.py b/image.py
index 9a3daaaff..570d00052 100644
--- a/image.py
+++ b/image.py
@@ -179,7 +179,7 @@ class CdromInstallMethod(ImageInstallMethod):
 	return self.tree + "/" + filename
 
     def getRPMFilename(self, h, timer, callback=None):
-        if h[1000002] == None:
+        if h[1000002] == None or 1000002 not in h.keys():
             log ("header for %s has no disc location tag, assuming it's"
                  "on the current CD" %(h[1000000],))
         elif h[1000002] not in self.currentDisc:
@@ -482,7 +482,7 @@ class NfsIsoInstallMethod(NfsInstallMethod):
 	# Make sure all of the correct CD images are available
 	missing_images = []
 	for h in hl.values():
-	    if h[1000002] is None:
+	    if h[1000002] is None or 1000002 not in h.keys():
 		continue
 	    
 	    if not self.discImages.has_key(h[1000002]):