diff --git a/Shorewall-core/lib.common b/Shorewall-core/lib.common
index 6c13e796f..75be7261d 100644
--- a/Shorewall-core/lib.common
+++ b/Shorewall-core/lib.common
@@ -172,6 +172,7 @@ run_it() {
 error_message() # $* = Error Message
 {
    echo "   $@" >&2
+   return 1
 }
 
 #
diff --git a/Shorewall/Perl/prog.footer b/Shorewall/Perl/prog.footer
index 7f14e9462..d24ed7cca 100644
--- a/Shorewall/Perl/prog.footer
+++ b/Shorewall/Perl/prog.footer
@@ -17,7 +17,7 @@ usage() {
     echo "   reset"
     echo "   refresh"
     echo "   restart"
-    echo "   run <function> [ <argument> ... ]"
+    echo "   run <command> [ <parameter> ... ]"
     echo "   status"
     echo "   up <interface>"
     echo "   version"
@@ -373,10 +373,14 @@ case "$COMMAND" in
 	status=0
 	;;
     run)
-	shift
-	detect_configuration
-	eval $@
-	status=$?
+	if [ $# -gt 1 ]; then
+	    shift
+	    detect_configuration
+	    eval $@
+	    status=$?
+	else
+	    error_message "ERROR: Missing command"
+	fi
 	;;
     version)
 	[ $# -ne 1 ] && usage 2