diff --git a/admin/srvconvert.c b/admin/srvconvert.c
index 36ee2e40b..91cd14e64 100644
--- a/admin/srvconvert.c
+++ b/admin/srvconvert.c
@@ -60,7 +60,8 @@ static struct getargs args[] = {
 
 static int num_args = sizeof(args) / sizeof(args[0]);
 
-int srvconv(int argc, char **argv)
+int
+srvconv(int argc, char **argv)
 {
     krb5_error_code ret;
     int optind = 0;
@@ -78,6 +79,14 @@ int srvconv(int argc, char **argv)
 	return 0;
     }
 
+    argc -= optind;
+    argv += optind;
+
+    if (argc != 0) {
+	arg_printusage(args, num_args, "");
+	return 1;
+    }
+
     if(keytab == NULL){
 	ret = krb5_kt_default_name(context, keytab_name, sizeof(keytab_name));
 	if(ret) {