diff --git a/contrib/devtools/gen-manpages.sh b/contrib/devtools/gen-manpages.sh
index b4d9a668b..a370aed1f 100755
--- a/contrib/devtools/gen-manpages.sh
+++ b/contrib/devtools/gen-manpages.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 export LC_ALL=C
 TOPDIR=${TOPDIR:-$(git rev-parse --show-toplevel)}
diff --git a/contrib/tidy_datadir.sh b/contrib/tidy_datadir.sh
index 5d6d82644..0d614e1c9 100755
--- a/contrib/tidy_datadir.sh
+++ b/contrib/tidy_datadir.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ -d "$1" ]; then
-  cd "$1"
+  cd "$1" || exit 1
 else
   echo "Usage: $0 <datadir>" >&2
   echo "Removes obsolete Bitcoin database files" >&2
diff --git a/share/genbuild.sh b/share/genbuild.sh
index 895ce3792..6d35faa97 100755
--- a/share/genbuild.sh
+++ b/share/genbuild.sh
@@ -7,7 +7,7 @@
 
 export LC_ALL=C
 if [ $# -gt 1 ]; then
-    cd "$2"
+    cd "$2" || exit 1
 fi
 if [ $# -gt 0 ]; then
     FILE="$1"