diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index 1348e46e8a..0eea2b823f 100644
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -650,9 +650,11 @@ cleanup:
 
 	if( op->o_req_dn.bv_val != NULL ) {
 		free( op->o_req_dn.bv_val );
+		op->o_req_dn.bv_val = NULL;
 	}
 	if( op->o_req_ndn.bv_val != NULL ) {
 		free( op->o_req_ndn.bv_val );
+		op->o_req_ndn.bv_val = NULL;
 	}
 
 	return rs->sr_err;