diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index a977d6cb16..a2e479433f 100644
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -44,11 +44,12 @@ objectClassMatch(
 		}
 
 		/* desc form, return undefined */
-		return LDAP_CONSTRAINT_VIOLATION;
+		return SLAPD_COMPARE_UNDEFINED;
 	}
 
 	if ( oc == NULL ) {
-		return LDAP_CONSTRAINT_VIOLATION;
+		/* unrecognized stored value */
+		return SLAPD_COMPARE_UNDEFINED;
 	}
 
 #if 0