diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c
index abeac6f4dc..ff076944fc 100644
--- a/servers/slapd/ad.c
+++ b/servers/slapd/ad.c
@@ -97,6 +97,7 @@ int slap_bv2ad(
 	char **tokens;
 
 	assert( ad != NULL );
+	assert( *ad == NULL ); /* temporary */
 	assert( *text != NULL );
 
 	if( bv == NULL || bv->bv_len == 0 ) {
diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index dc9ef6fc44..02817d2442 100644
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -98,9 +98,10 @@ get_filter(
 			break;
 		}
 
-		assert( f->f_ava != NULL );
 
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
+		assert( f->f_ava != NULL );
+
 		*fstr = ch_malloc( sizeof("(=)")
 			+ f->f_av_desc->ad_cname->bv_len
 			+ f->f_av_value->bv_len );
diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index 39f1acc5e5..ec6334da55 100644
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -102,7 +102,7 @@ schema_info( Entry **entry, char **text )
 	{
 		/* Out of memory, do something about it */
 		entry_free( e );
-		text = "out of memory";
+		*text = "out of memory";
 		return LDAP_OTHER;
 	}