diff --git a/security/nss/cmd/pk11util/pk11table.c b/security/nss/cmd/pk11util/pk11table.c
index f6686a89088f..f8d7f813c541 100644
--- a/security/nss/cmd/pk11util/pk11table.c
+++ b/security/nss/cmd/pk11util/pk11table.c
@@ -1160,7 +1160,7 @@ const Commands _commands[] = {
 "Create a new CK_MECHANISM object with type NULL paramters and specified type\n"
 " varName        variable name of the new mechansim\n"
 " mechanismType  CKM_ mechanism type value to set int the type field\n",
-	{ArgMechanism|ArgOut, ArgULong, ArgNone, ArgNone, ArgNone, 
+	{ArgVar|ArgNew, ArgULong, ArgNone, ArgNone, ArgNone, 
 	 ArgNone, ArgNone, ArgNone, ArgNone, ArgNone }},
     {"BuildTemplate", F_BuildTemplate,
 "BuildTemplate template\n\n"
diff --git a/security/nss/cmd/pk11util/pk11util.c b/security/nss/cmd/pk11util/pk11util.c
index 8a863a7dbfcc..3688efd9d9e8 100644
--- a/security/nss/cmd/pk11util/pk11util.c
+++ b/security/nss/cmd/pk11util/pk11util.c
@@ -748,6 +748,7 @@ DeleteVariable(const char *bp)
 	if (PL_strcasecmp((*current)->vname,vname) == 0) {
 	        argFree((*current)->value);
 		*current = (*current)->next;
+		break;
 	}
     }
     return CKR_OK;