diff --git a/tools/configure.sh b/tools/configure.sh
index fcfafe70ae3..3bcbaef7afb 100755
--- a/tools/configure.sh
+++ b/tools/configure.sh
@@ -33,6 +33,8 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
+set -e
+
 WD=`test -d ${0%/*} && cd ${0%/*}; pwd`
 TOPDIR="${WD}/.."
 USAGE="
diff --git a/tools/sethost.sh b/tools/sethost.sh
index 93d159ec792..165ec24f204 100755
--- a/tools/sethost.sh
+++ b/tools/sethost.sh
@@ -17,6 +17,8 @@
 # under the License.
 #
 
+set -e
+
 progname=$0
 host=
 wenv=