diff --git a/mmc/obmc-flash-mmc-mount.service.in b/mmc/obmc-flash-mmc-mount.service.in
index 36316fd..aaeb897 100644
--- a/mmc/obmc-flash-mmc-mount.service.in
+++ b/mmc/obmc-flash-mmc-mount.service.in
@@ -7,6 +7,7 @@
 RemainAfterExit=no
 ExecStart=/usr/bin/obmc-flash-bmc mmc-mount @MEDIA_DIR@
 ExecStart=/bin/mkdir -p @MEDIA_DIR@/hostfw
+ExecStart=-/sbin/fsck.ext4 -p /dev/disk/by-partlabel/hostfw
 ExecStart=-/bin/mount PARTLABEL=hostfw @MEDIA_DIR@/hostfw -t ext4
 
 [Install]
diff --git a/obmc-flash-bmc b/obmc-flash-bmc
index 833a565..d604e71 100644
--- a/obmc-flash-bmc
+++ b/obmc-flash-bmc
@@ -547,6 +547,13 @@
     primaryDir="${mediaDir}/rofs-${primaryId}-functional"
     secondaryDir="${mediaDir}/rofs-${secondaryId}"
 
+    # Check the alternate version, remove it if it's corrupted. This can occur
+    # when the BMC is rebooted in the middle of a code update for example.
+    if ! fsck.ext4 -p "/dev/disk/by-partlabel/rofs-${secondaryId}"; then
+        flashid="${secondaryId}"
+        mmc_remove
+    fi
+
     mkdir -p "${primaryDir}"
     mkdir -p "${secondaryDir}"