diff --git a/steps/10-wipe.step b/steps/10-wipe.step
index 8f6cf9e..4e010c2 100755
--- a/steps/10-wipe.step
+++ b/steps/10-wipe.step
@@ -1,12 +1,20 @@
 #!/bin/sh
 
-echo -n "~> Going to wipe $blockdevice. You sure? (y/N) "
+echo "~> Going to wipe $blockdevice. Just skip it if you are really sure that the drive is clean."
+echo -n "~> Wipe block device? (Y/n) "
+read answer
+
+if [ "$answer" == "n" ]; then
+	exit 0
+fi
+
+echo -n "~> You sure? (y/N) "
 read answer
 
 if [ "$answer" == "y" ]; then
 	echo "~> OK. Be patient now, that could take some time..."
 	dd if=/dev/zero of=$blockdevice status=progress
-	exit $?
+	exit 0
 else
 	exit 1
 fi