diff --git a/scripts/dump_genesis.sh b/scripts/dump_genesis.sh
index db47c0b67b..3ee876554a 100755
--- a/scripts/dump_genesis.sh
+++ b/scripts/dump_genesis.sh
@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+# Fail if anything goes wrong
+set -e
+set -o pipefail
+
 if [ "$1" = "" ]; then
   echo "Usage: $0 genesis.json"
   exit 1
@@ -11,9 +15,9 @@ trap "rm -r $D" 0
 GENJSON="$1"
 UNAME=$(uname)
 if [[ "${UNAME}" == *"MINGW"* ]]; then
-	GOPATH1=$HOME/go
+    GOPATH1=$HOME/go
 else
-	GOPATH1=$(go env GOPATH | cut -d: -f1)
+    GOPATH1=$(go env GOPATH | cut -d: -f1)
 fi
 $GOPATH1/bin/algod -d $D -g "$GENJSON" -x >/dev/null
 LEDGERS=$D/*/ledger.*sqlite
@@ -40,7 +44,7 @@ for LEDGER in $LEDGERS; do
         SORT=id
         ;;
       onlineroundparamstail)
-        SORT=round
+        SORT=rnd
         ;;
       participationperiods)
         SORT=period
@@ -64,7 +68,7 @@ for LEDGER in $LEDGERS; do
         SORT=address
         ;;
       txtail)
-        SORT=round
+        SORT=rnd
         ;;
       catchpointfirststageinfo)
         SORT=round
@@ -78,9 +82,9 @@ for LEDGER in $LEDGERS; do
         ;;
     esac
 
-    echo ".schema $T" | sqlite3 $LEDGER
+    echo ".schema $T" | sqlite3 "$LEDGER"
     ( echo .headers on;
-      echo .mode insert $T;
-      echo "SELECT * FROM $T ORDER BY $SORT;" ) | sqlite3 $LEDGER
+      echo .mode insert "$T";
+      echo "SELECT * FROM $T ORDER BY $SORT;" ) | sqlite3 "$LEDGER"
   done
 done