diff --git a/diyvpn.sh b/diyvpn.sh
index ad2d5d7..7df31de 100755
--- a/diyvpn.sh
+++ b/diyvpn.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
-set -euo pipefail
+set -Eeuo pipefail
+
+# Trap ERR to provide better error reporting
+trap 'echo "Error on line $LINENO of $0: $BASH_COMMAND"' ERR
 
 opdir="${1?Output dir missing}"