diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index f8f2d121d3..81243d9ebf 100644
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -210,7 +210,9 @@ get_filter(
 		if ( err != LDAP_SUCCESS ) {
 			break;
 		}
+#if XXX
 		assert( f->f_and != NULL );
+#endif
 		break;
 
 	case LDAP_FILTER_OR:
@@ -224,7 +226,9 @@ get_filter(
 		if ( err != LDAP_SUCCESS ) {
 			break;
 		}
+#if XXX
 		assert( f->f_or != NULL );
+#endif
 		break;
 
 	case LDAP_FILTER_NOT:
@@ -239,7 +243,9 @@ get_filter(
 		if ( err != LDAP_SUCCESS ) {
 			break;
 		}
+#if XXX
 		assert( f->f_not != NULL );
+#endif
 		break;
 
 	case LDAP_FILTER_EXT:
@@ -255,7 +261,9 @@ get_filter(
 			break;
 		}
 
+#if nothosed
 		assert( f->f_mra != NULL );
+#endif
 		break;
 
 	default:
diff --git a/servers/slapd/mra.c b/servers/slapd/mra.c
index a8f2d7fcfd..2c2eb178fe 100644
--- a/servers/slapd/mra.c
+++ b/servers/slapd/mra.c
@@ -246,10 +246,11 @@ get_mra(
 		&ma->ma_value, &value, text );
 	if ( rc == LDAP_SUCCESS ) {
 		ber_dupbv( &ma->ma_value, &value );
-	}
+	} else
+#else
+	if( rc != LDAP_SUCCESS )
 #endif
-
-	if( rc != LDAP_SUCCESS ) {
+	{
 		mra_free( ma, 1 );
 		return rc;
 	}