diff --git a/servers/slapd/ava.c b/servers/slapd/ava.c
index bad4e77066..2758974422 100644
--- a/servers/slapd/ava.c
+++ b/servers/slapd/ava.c
@@ -111,6 +111,7 @@ get_ava(
 		Debug( LDAP_DEBUG_FILTER,
 		"get_ava: illegal value for attributeType %s\n", type.bv_val, 0, 0 );
 		ber_dupbv_x( &aa->aa_value, &value, op->o_tmpmemctx );
+		*text = NULL;
 		rc = LDAP_SUCCESS;
 	}
 
diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index 60f4f0e063..0a76e2bdd6 100644
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -478,6 +478,7 @@ return_error:
 			return rc;
 		}
 
+		*text = NULL;
 		rc = LDAP_SUCCESS;
 	}