diff --git a/usr.sbin/watchdogd/watchdogd.c b/usr.sbin/watchdogd/watchdogd.c
index 8d084c78007c..01ccdd6a0c41 100644
--- a/usr.sbin/watchdogd/watchdogd.c
+++ b/usr.sbin/watchdogd/watchdogd.c
@@ -129,8 +129,7 @@ main(int argc, char *argv[])
 			timeout |= WD_PASSIVE;
 		else
 			timeout |= WD_ACTIVE;
-		if (watchdog_patpat() < 0 &&
-		    (timeout & WD_INTERVAL) != WD_TO_NEVER)
+		if (watchdog_patpat() < 0)
 			err(EX_OSERR, "patting the dog");
 		return (EX_OK);
 	}
@@ -282,6 +281,8 @@ parseargs(int argc, char *argv[])
 			/* NOTREACHED */
 		}
 	}
+	if (argc != optind)
+		errx(EX_USAGE, "extra arguments.");
 	if (is_daemon && timeout < WD_TO_1SEC)
 		errx(EX_USAGE, "-t argument is less than one second.");
 }