diff --git a/servers/slapd/value.c b/servers/slapd/value.c
index 58f1711d1c..2a0ea16009 100644
--- a/servers/slapd/value.c
+++ b/servers/slapd/value.c
@@ -39,10 +39,10 @@ value_add_fast(
 		    *maxvals * sizeof(struct berval *) );
 	}
 
-	for ( i = 0, j = 0; i < naddvals; i++, j++ ) {
+	for ( i = 0, j = 0; i < naddvals; i++ ) {
 		if ( addvals[i]->bv_len > 0 ) {
 			(*vals)[nvals + j] = ber_bvdup( addvals[i] );
-			if( (*vals)[nvals + j] == NULL ) break;
+			if( (*vals)[nvals + j] != NULL ) j++;
 		}
 	}
 	(*vals)[nvals + j] = NULL;