diff --git a/scripts/ubuntu_20.04_install_map.sh b/scripts/ubuntu_20.04_install_map.sh
index 44b8068f..85cbb316 100755
--- a/scripts/ubuntu_20.04_install_map.sh
+++ b/scripts/ubuntu_20.04_install_map.sh
@@ -49,8 +49,9 @@ fi
 # Use D.C. to initialized DB because it is so small.
 wget --continue https://download.geofabrik.de/north-america/us/district-of-columbia-latest.osm.pbf \
   -O /tmp/district-of-columbia-latest.osm.pbf
+
 # Initialize indexes and global polygons.   This may take multiple tries.
-set +x
+set +e
 MAX_TRIES=3
 COUNT=0
 SUCCESS=false
@@ -73,6 +74,8 @@ if [[ "${SUCCESS}" == false ]]; then
   exit 6
 fi
 
+set -e
+
 cat >/usr/local/etc/renderd.conf <<'EOF'
 [renderd]
 num_threads=4