diff --git a/mozilla/security/jss/org/mozilla/jss/util/jssutil.c b/mozilla/security/jss/org/mozilla/jss/util/jssutil.c
index e14d4e1dd0b..4612ae16639 100644
--- a/mozilla/security/jss/org/mozilla/jss/util/jssutil.c
+++ b/mozilla/security/jss/org/mozilla/jss/util/jssutil.c
@@ -392,8 +392,8 @@ JSS_OctetStringToByteArray(JNIEnv *env, SECItem *item)
     jbyte *bytes;
     int size;    /* size of the resulting byte array */
 
-    PR_ASSERT(env != NULL && item && item->len>0);
-    if (!env || item || !item->len || !item->data) {
+    PR_ASSERT(env != NULL && item != NULL && item->len>0);
+    if (!env || !item || !item->len || !item->data) {
         return NULL;
     }