diff --git a/policycoreutils/scripts/fixfiles b/policycoreutils/scripts/fixfiles
index 29982e25..014ab040 100755
--- a/policycoreutils/scripts/fixfiles
+++ b/policycoreutils/scripts/fixfiles
@@ -365,6 +365,7 @@ shift $(( OPTIND - 1 ))
 command="$1"
 if [ -z "$command" ]; then
     usage
+    exit 1
 fi
 
 # Move out command from arguments
@@ -375,10 +376,11 @@ shift
 #
 
 if [ ! -z "$RPMFILES" ]; then
-    process "$command"
     if [ $# -gt 0 ]; then
-	    usage
+	usage
+	exit 1
     fi
+    process "$command"
 else
     if [ -z "$1" ]; then
 	process "$command"