diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index ceba658ced..ac36b8a0af 100644
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -463,10 +463,8 @@ test_ava_filter(
 		int		hasSubordinates;
 		struct berval	hs;
 
-		/*
-		 * No other match should be allowed ...
-		 */
-		assert( type == LDAP_FILTER_EQUALITY );
+		/* No other match is supported */
+		if( type != LDAP_FILTER_EQUALITY ) return LDAP_OTHER;
 		
 		if ( op->o_bd->be_has_subordinates( op, e, &hasSubordinates ) !=
 			LDAP_SUCCESS )