diff --git a/servers/slapd/value.c b/servers/slapd/value.c
index 9df3ab2037..9ed1ad969f 100644
--- a/servers/slapd/value.c
+++ b/servers/slapd/value.c
@@ -324,7 +324,10 @@ value_match(
 	struct berval nv1 = { 0, NULL };
 	struct berval nv2 = { 0, NULL };
 
-	if( !mr->smr_match ) {
+	/*
+	 * FIXME: mr should NOT be NULL ...
+	 */
+	if( !mr || !mr->smr_match ) {
 		return LDAP_INAPPROPRIATE_MATCHING;
 	}