diff --git a/build_library/disk_util b/build_library/disk_util
index 4fc2024bf2..6616ef5dcc 100755
--- a/build_library/disk_util
+++ b/build_library/disk_util
@@ -230,6 +230,10 @@ def GetPartitionTableFromImage(options, config, partitions):
       part['image_compat'] = False
 
   for part in partitions.itervalues():
+    if part.get('type', 'blank') == 'blank':
+      continue
+    if not part.get('image_exists', False):
+      continue
     if not part.get('fs_type', None):
       continue
     with PartitionLoop(options, part) as loop_dev: