diff --git a/servers/slapd/schema_check.c b/servers/slapd/schema_check.c
index d765934758..0cc2b886ed 100644
--- a/servers/slapd/schema_check.c
+++ b/servers/slapd/schema_check.c
@@ -424,6 +424,7 @@ entry_schema_check(
 	}
 
 	if( extensible ) {
+		*text = NULL;
 		return LDAP_SUCCESS;
 	}
 
@@ -471,6 +472,7 @@ entry_schema_check(
 		}
 	}
 
+	*text = NULL;
 	return LDAP_SUCCESS;
 }