Index: mozilla/security/nss/lib/pk11wrap/pk11akey.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/pk11akey.c,v
retrieving revision 1.13
diff -pU4 -r1.13 mozilla/security/nss/lib/pk11wrap/pk11akey.c
--- mozilla/security/nss/lib/pk11wrap/pk11akey.c
+++ mozilla/security/nss/lib/pk11wrap/pk11akey.c
@@ -1728,16 +1728,19 @@ pk11_DoKeys(PK11SlotInfo *slot, CK_OBJEC
 {
     SECStatus rv = SECSuccess;
     SECKEYPrivateKey *privKey;
     pk11KeyCallback *keycb = (pk11KeyCallback *) arg;
+    if (!arg) {
+        return SECFailure;
+    }
 
     privKey = PK11_MakePrivKey(slot,nullKey,PR_TRUE,keyHandle,keycb->wincx);
 
     if (privKey == NULL) {
 	return SECFailure;
     }
 
-    if (keycb && (keycb->callback)) {
+    if (keycb->callback) {
 	rv = (*keycb->callback)(privKey,keycb->callbackArg);
     }
 
     SECKEY_DestroyPrivateKey(privKey);