diff --git a/wfinfo-ng b/wfinfo-ng
index fb81d45..090b4ea 100755
--- a/wfinfo-ng
+++ b/wfinfo-ng
@@ -13,12 +13,17 @@
 #
 # This'll put it in ~/.cargo/bin, which we exec directly
 #
+set -euo pipefail
 
 # Assumes Flatpak Steam
 wfinfo="$HOME/.cargo/bin/wfinfo"
 update="$HOME/Projects/wfinfo-ng/update.sh"
 logfile="$HOME/.var/app/com.valvesoftware.Steam/.steam/steam/steamapps/compatdata/230410/pfx/drive_c/users/steamuser/AppData/Local/Warframe/EE.log"
 
+tmpdir="$(mktemp -d)"
+pushd "$tmpdir" >/dev/null 2>&1
+echo "Running in $tmpdir"
+
 # Basline tests
 if ! [ -e "$logfile" ]; then
 	echo "Could not find logfile: $logfile"
@@ -35,8 +40,14 @@ fi
 
 "$update"
 
-exec toolbox run \
+toolbox run \
 	--container wfinfo-ng \
 	"$wfinfo" \
 	--window-name "Warframe" \
-	"$logfile"
+	"$logfile" \
+	|| true
+
+popd >/dev/null 2>&1
+echo "Cleaning up $tmpdir"
+rm -rf "$tmpdir"
+echo "All wrapped up"