diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index e994b29d93..204caa0380 100644
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -583,6 +583,8 @@ slap_mods2entry(
 		tail = &attr->a_next;
 	}
 
+	*text = NULL;
+
 	return LDAP_SUCCESS;
 }
 
diff --git a/servers/slapd/schema_check.c b/servers/slapd/schema_check.c
index 30175b126c..d765934758 100644
--- a/servers/slapd/schema_check.c
+++ b/servers/slapd/schema_check.c
@@ -684,6 +684,8 @@ int structural_class(
 		return LDAP_OBJECT_CLASS_VIOLATION;
 	}
 
+	*text = NULL;
+
 	return LDAP_SUCCESS;
 }