diff --git a/qubes-rpc/qvm-run b/qubes-rpc/qvm-run
index 410ff32..f4aa2da 100755
--- a/qubes-rpc/qvm-run
+++ b/qubes-rpc/qvm-run
@@ -20,8 +20,8 @@
 #
 #
 
-if [ $# -lt 2 ] ; then
-	cat <<USAGE
+function print_usage(){
+cat >&2 <<USAGE
 Usage: $0 vmname command arguments
 Executes a command in another VM using the qubes.VMShell RPC service.  The
 arguments are joined with spaces and passed to "bash -c".
@@ -33,11 +33,20 @@ is your terminal.
 
 You can use \$dispvm or --dispvm instead of vmname to start a new DisposableVM.
 USAGE
-	exit 1
+}
+
+if [ $# -lt 2 ] ; then
+    print_usage
+    exit 1
 fi
-VMNAME=$1
+
+VMNAME="$1"
 shift
-if [ $VMNAME = "--dispvm" ] ; then
-	VMNAME='$dispvm'
+
+if [ "$VMNAME" = "--dispvm" ] ; then
+    VMNAME='$dispvm'
+elif [ "$VMNAME" = "" ] ; then
+    print_usage
+    exit 1
 fi
-exec /usr/lib/qubes/qrexec-client-vm $VMNAME qubes.VMShell "/usr/lib/qubes/qrun-in-vm" "$@"
+exec /usr/lib/qubes/qrexec-client-vm "$VMNAME" qubes.VMShell "/usr/lib/qubes/qrun-in-vm" "$@"