diff --git a/pkg/release-rpi3/genimage.sh b/pkg/release-rpi3/genimage.sh
index aba4672..fed0bcd 100755
--- a/pkg/release-rpi3/genimage.sh
+++ b/pkg/release-rpi3/genimage.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -u -e -x
+set -u -e
 
 FILE=$1
 MOUNTED=0
@@ -16,6 +16,11 @@ trap do_cleanup ERR INT
 
 cd `dirname $0`
 
+if [ -e "$FILE" ]; then
+	echo "Error, $FILE exists"
+	exit 1
+fi
+
 truncate -s 1G $FILE
 
 parted --script $FILE \
diff --git a/pkg/release-rpi3/install.sh b/pkg/release-rpi3/install.sh
index de7226d..33c75ee 100755
--- a/pkg/release-rpi3/install.sh
+++ b/pkg/release-rpi3/install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -u -e -x
+set -u -e
 
 CONFIRM="Yes, I am"
 DEVICE=$1