diff --git a/CHANGES b/CHANGES
index e8b136a3bc12b92b3e0045c5f0757e6e6bed9d1e..a13559ee9ca0fdc724b024c3dc3a4c81420b634b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,7 @@ OpenLDAP 2.4.16 Release (2009/03/20)
 	Fixed slapd ctxcsn race condition (ITS#6001)
 	Fixed slapd debug message (ITS#6027)
 	Fixed slapd redundant module loading (ITS#6030)
+	Fixed slapd schema_init freed value (ITS#6036)
 	Fixed slapd syncrepl newCookie sync messages (ITS#5972)
 	Fixed slapd syncrepl hang during shutdown (ITS#6011)
 	Fixed slapd syncrepl too many MMR messages (ITS#6020)
diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 24c9933eb520b89233c1401a51538dd694a6a453..85c62249df2d1b343c86de464ee3ec6174470023 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -2814,6 +2814,7 @@ UUIDNormalize(
 
 		} else {
 			slap_sl_free( normalized->bv_val, ctx );
+			BER_BVZERO( normalized );
 			return LDAP_INVALID_SYNTAX;
 		}