2 files changed, 16 insertions, 15 deletions

diff --git a/documentation/tools/addkey.sh b/documentation/tools/addkey.sh
index 9b77bdf4df..776aeee40c 100755
--- a/documentation/tools/addkey.sh
+++ b/documentation/tools/addkey.sh
@@ -73,19 +73,20 @@ if [ $# -ne 0 ] ; then
 		case $(expr "${arg}" : '^[0-9A-Fa-f]\{8,16\}$') in
 		8)
 			warning "${arg}: recommend using 16-digit keyid"
-			;&
+			;;
 		16)
-			keyid=$(getkeybyid "${arg}")
-			if [ -n "${keyid}" ] ; then
-				keyids="${keyids} ${keyid}"
-			else
-				warning "${arg} not found"
-			fi
 			;;
 		*)
 			warning "${arg} does not appear to be a valid key ID"
+			continue
 			;;
 		esac
+		keyid=$(getkeybyid "${arg}")
+		if [ -n "${keyid}" ] ; then
+			keyids="${keyids} ${keyid}"
+		else
+			warning "${arg} not found"
+		fi
 	done
 else
 	# Search for keys by freebsd.org email
diff --git a/documentation/tools/checkkey.sh b/documentation/tools/checkkey.sh
index c4772f13b3..8740a5dde6 100755
--- a/documentation/tools/checkkey.sh
+++ b/documentation/tools/checkkey.sh
@@ -105,20 +105,20 @@ if [ $# -ne 0 ] ; then
 		case $(expr "${arg}" : '^[0-9A-Fa-f]\{8,16\}$') in
 		8)
 			warning "${arg}: recommend using 16-digit keyid"
-			;&
+			;;
 		16)
-			keyid=$(getkeybyid "${arg}")
-			if [ -n "${keyid}" ] ; then
-				keyids="${keyids} ${keyid}"
-			else
-				warning "${arg} not found"
-			fi
 			;;
 		*)
 			warning "${arg} does not appear to be a valid key ID"
+			continue
 			;;
 		esac
-		shift
+		keyid=$(getkeybyid "${arg}")
+		if [ -n "${keyid}" ] ; then
+			keyids="${keyids} ${keyid}"
+		else
+			warning "${arg} not found"
+		fi
 	done
 else
 	# Search for keys by freebsd.org email