diff --git a/osync-batch.sh b/osync-batch.sh
index bc9c6de..b127db9 100755
--- a/osync-batch.sh
+++ b/osync-batch.sh
@@ -104,6 +104,7 @@ function Usage
         echo "--dry                     Will run osync without actually doing anything; just testing"
         echo "--silent                  Will run osync without any output to stdout, used for cron jobs"
         echo "--verbose                 Increases output"
+        exit 128
 }
 
 silent=0
@@ -136,7 +137,10 @@ do
 		;;
 		--help|-h)
 		Usage
-		exit 0
+		;;
+		*)
+		Log "Unknown param '$i'"
+		Usage
 		;;
 	esac
 done
diff --git a/osync.sh b/osync.sh
index d5ec46e..aee490b 100755
--- a/osync.sh
+++ b/osync.sh
@@ -2049,6 +2049,7 @@ then
 	Usage
 fi
 
+first=1
 for i in "$@"
 do
 	case $i in
@@ -2109,7 +2110,15 @@ do
 		--no-locks)
 		nolocks=1
 		;;
+		*)
+		if [ $first == "0" ]
+		then
+			LogError "Unknown option '$i'"
+			Usage
+		fi
+		;;
 	esac
+	first=0
 done
 
 # Remove leading space if there is one