diff --git a/servers/slapd/back-bdb/passwd.c b/servers/slapd/back-bdb/passwd.c
index a47cf180bc..a05f22146c 100644
--- a/servers/slapd/back-bdb/passwd.c
+++ b/servers/slapd/back-bdb/passwd.c
@@ -216,6 +216,7 @@ retry:	/* transaction retry */
 			*text = NULL;
 			goto retry;
 		case 0:
+			*text = NULL;
 			break;
 		default:
 			rc = LDAP_OTHER;