diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index 00a0a2e23da3..3e1ddce66b14 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -42,11 +42,11 @@ err() {
 }
 
 cleanup() {
+	umount ${DESTDIR}/dev 2>/dev/null
+	umount ${DESTDIR}
 	if [ ! -z "${mddev}" ]; then
 		mdconfig -d -u ${mddev}
 	fi
-	umount ${DESTDIR}/dev
-	umount ${DESTDIR}
 
 	return 0
 }