diff --git a/.alltests b/.alltests
index bccb126cb8..ac30d57386 100755
--- a/.alltests
+++ b/.alltests
@@ -1,33 +1,22 @@
 #!/bin/bash
 
+set -e
+
 TOP_DIR=$(python -c "import os; print os.path.dirname(os.path.realpath('$0'))")
 
 echo "==== Unit tests ===="
 resetswift
 $TOP_DIR/.unittests $@
-rvalue=$?
-if [ $rvalue != 0 ] ; then
-    exit $rvalue
-fi
 
 echo "==== Func tests ===="
 resetswift
 startmain
 $TOP_DIR/.functests $@
-rvalue=$?
-if [ $rvalue != 0 ] ; then
-    exit $rvalue
-fi
 
 echo "==== Probe tests ===="
 resetswift
 $TOP_DIR/.probetests $@
-rvalue=$?
-if [ $rvalue != 0 ] ; then
-    exit $rvalue
-fi
 
 echo "All tests runs fine"
 
 exit 0
-
diff --git a/.functests b/.functests
index 5e3b177176..fb491a3af4 100755
--- a/.functests
+++ b/.functests
@@ -4,7 +4,6 @@
 # SWIFT_TEST_IN_PROCESS=1 tox -e func -- --pdb test.functional.tests.TestFile.testCopy
 
 SRC_DIR=$(python -c "import os; print os.path.dirname(os.path.realpath('$0'))")
-set -e
 
 cd ${SRC_DIR}
 export TESTS_DIR=${SRC_DIR}/test/functional
diff --git a/doc/saio/bin/remakerings b/doc/saio/bin/remakerings
index 1452cea739..c067f1b102 100755
--- a/doc/saio/bin/remakerings
+++ b/doc/saio/bin/remakerings
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 cd /etc/swift
 
 rm -f *.builder *.ring.gz backups/*.builder backups/*.ring.gz
diff --git a/doc/saio/bin/resetswift b/doc/saio/bin/resetswift
index a9845674cd..e8d2232d67 100755
--- a/doc/saio/bin/resetswift
+++ b/doc/saio/bin/resetswift
@@ -1,9 +1,13 @@
 #!/bin/bash
 
-swift-init all stop
+set -e
+
+swift-init all kill
 # Remove the following line if you did not set up rsyslog for individual logging:
 sudo find /var/log/swift -type f -exec rm -f {} \;
-sudo umount /mnt/sdb1
+if cut -d' ' -f2 /proc/mounts | grep -q /mnt/sdb1 ; then
+    sudo umount /mnt/sdb1
+fi
 # If you are using a loopback device set SAIO_BLOCK_DEVICE to "/srv/swift-disk"
 sudo mkfs.xfs -f ${SAIO_BLOCK_DEVICE:-/dev/sdb1}
 sudo mount /mnt/sdb1
diff --git a/doc/saio/bin/startmain b/doc/saio/bin/startmain
index 0098b58702..f099424db2 100755
--- a/doc/saio/bin/startmain
+++ b/doc/saio/bin/startmain
@@ -1,3 +1,5 @@
 #!/bin/bash
 
-swift-init main start
\ No newline at end of file
+set -e
+
+swift-init main start
diff --git a/doc/saio/bin/startrest b/doc/saio/bin/startrest
index 0c229cab94..bb1996b25b 100755
--- a/doc/saio/bin/startrest
+++ b/doc/saio/bin/startrest
@@ -1,3 +1,5 @@
 #!/bin/bash
 
-swift-init rest start
\ No newline at end of file
+set -e
+
+swift-init rest start