diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator
index a829bbc2..1754f376 100755
--- a/src/sbin/livemedia-creator
+++ b/src/sbin/livemedia-creator
@@ -690,16 +690,26 @@ def anaconda_cleanup(dirinstall_path):
     Cleanup any leftover mounts from anaconda
 
     :param str dirinstall_path: Path where anaconda mounts things
+    :returns: True if cleanups were successful. False if any of them failed.
 
     If anaconda crashes it may leave things mounted under this path. It will
     typically be set to /mnt/sysimage/
+
+    Attempts to cleanup may also fail. Catch these and continue trying the
+    other mountpoints.
     """
+    rc = True
     dirinstall_path = os.path.abspath(dirinstall_path)
     # unmount filesystems
     for mounted in reversed(open("/proc/mounts").readlines()):
         (_device, mountpoint, _rest) = mounted.split(" ", 2)
         if mountpoint.startswith(dirinstall_path) and os.path.ismount(mountpoint):
-            umount(mountpoint)
+            try:
+                umount(mountpoint)
+            except subprocess.CalledProcessError:
+                log.error("Cleanup of %s failed. See program.log for details", mountpoint)
+                rc = False
+    return rc
 
 
 def novirt_install(opts, disk_img, disk_size):
@@ -790,9 +800,6 @@ def novirt_install(opts, disk_img, disk_size):
     finally:
         log_monitor.shutdown()
 
-        # Make sure any leftover anaconda mounts have been cleaned up
-        anaconda_cleanup(dirinstall_path)
-
         # Move the anaconda logs over to a log directory
         log_dir = os.path.abspath(os.path.dirname(opts.logfile))
         log_anaconda = joinpaths(log_dir, "anaconda")
@@ -802,6 +809,10 @@ def novirt_install(opts, disk_img, disk_size):
             shutil.copy2(l, log_anaconda)
             os.unlink(l)
 
+        # Make sure any leftover anaconda mounts have been cleaned up
+        if not anaconda_cleanup(dirinstall_path):
+            raise InstallError("novirt_install cleanup of anaconda mounts failed.")
+
         if not opts.make_iso and not opts.make_fsimage and not opts.make_pxe_live:
             dm_name = os.path.splitext(os.path.basename(disk_img))[0]
             dm_path = "/dev/mapper/"+dm_name