diff --git a/qubes-rpc/qubes.WaitForRunningSystem b/qubes-rpc/qubes.WaitForRunningSystem
index 6c419a1d..06ed3493 100755
--- a/qubes-rpc/qubes.WaitForRunningSystem
+++ b/qubes-rpc/qubes.WaitForRunningSystem
@@ -1,4 +1,8 @@
 #!/bin/sh
 set -eu
-systemctl --wait --quiet is-system-running
-exit 0
+rc=0
+systemctl --wait is-system-running >&2 || rc=$?
+if test "$rc" -gt 0; then
+  LC_ALL=C TERM=dumb systemctl --failed --legend=no >&2
+fi
+exit "$rc"