diff --git a/ssh-add.c b/ssh-add.c
index 752b86dfcd8e..97872d1f6e5e 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -788,6 +788,7 @@ main(int argc, char **argv)
 	extern char *optarg;
 	extern int optind;
 	int agent_fd;
+	const char *errstr = NULL;
 	char *pkcs11provider = NULL, *skprovider = NULL;
 	char **dest_constraint_strings = NULL, **hostkey_files = NULL;
 	int r, i, ch, deleting = 0, ret = 0, key_only = 0, do_download = 0;
@@ -863,16 +864,16 @@ main(int argc, char **argv)
 			confirm = 1;
 			break;
 		case 'm':
-			minleft = (int)strtonum(optarg, 1, UINT_MAX, NULL);
-			if (minleft == 0) {
+			minleft = (u_int)strtonum(optarg, 1, UINT_MAX, &errstr);
+			if (errstr) {
 				usage();
 				ret = 1;
 				goto done;
 			}
 			break;
 		case 'M':
-			maxsign = (int)strtonum(optarg, 1, UINT_MAX, NULL);
-			if (maxsign == 0) {
+			maxsign = (u_int)strtonum(optarg, 1, UINT_MAX, &errstr);
+			if (errstr) {
 				usage();
 				ret = 1;
 				goto done;