--- /usr/share/zsh/functions/Misc/run-help.orig	2010-04-19 04:26:23.000000000 +0200
+++ /usr/share/zsh/functions/Misc/run-help	2010-10-15 17:54:53.249384368 +0200
@@ -97,7 +97,7 @@
 		builtin print -z "$cmd_args"
 		cmd_args=( ${(z)cmd_args} )
 		# Discard environment assignments, etc.
-		while [[ $cmd_args[1] != $1 ]]
+		while [[ $cmd_args[1] != $1 && $# -gt 1 ]]
 		do
 		    shift cmd_args
 		done