diff --git a/servers/slapd/back-meta/conn.c b/servers/slapd/back-meta/conn.c
index 87b3669370..46e5d20a0a 100644
--- a/servers/slapd/back-meta/conn.c
+++ b/servers/slapd/back-meta/conn.c
@@ -947,7 +947,7 @@ retry_lock:
 				i = meta_back_get_candidate( op, rs, &pndn );
 			}
 	
-			if ( rs->sr_err != LDAP_SUCCESS ) {
+			if ( i < 0 || rs->sr_err != LDAP_SUCCESS ) {
 				if ( mc != NULL ) {
 					meta_back_release_conn( op, mc );
 				}