--- /etc/rc.shutdown	2009-08-22 16:05:54.000000000 +0200
+++ /etc/rc.shutdown	2009-10-30 10:58:18.000000000 +0100
@@ -105,12 +105,14 @@
 	CS=/sbin/cryptsetup.static
 	do_uncrypt() {
 		if [ $# -ge 3 ]; then
-			stat_append "${1}.."
-			$CS remove $1 >/dev/null 2>&1
-			if [ $? -ne 0 ]; then
-				stat_append "failed "
-			else
-				stat_append "ok "
+			if [ -b /dev/mapper/$1 ] ;then
+				stat_append "${1}.."
+				$CS remove $1 >/dev/null 2>&1
+				if [ $? -ne 0 ]; then
+					stat_append "failed "
+				else
+					stat_append "ok "
+				fi
 			fi
 		fi
 	}