diff --git a/servers/slapd/tools/slapadd.c b/servers/slapd/tools/slapadd.c
index 0acdbdf453..fb4694985d 100644
--- a/servers/slapd/tools/slapadd.c
+++ b/servers/slapd/tools/slapadd.c
@@ -57,17 +57,17 @@ main( int argc, char **argv )
 			break;
 		}
 
-		if( !noschemacheck ) {
-			/* make sure the DN is valid */
-			if( dn_normalize( e->e_ndn ) == NULL ) {
-				fprintf( stderr, "%s: bad dn=\"%s\" (line=%d)\n",
-					progname, e->e_dn, lineno );
-				rc = EXIT_FAILURE;
-				entry_free( e );
-				if( continuemode ) continue;
-				break;
-			}
+		/* make sure the DN is valid */
+		if( dn_normalize( e->e_ndn ) == NULL ) {
+			fprintf( stderr, "%s: bad dn=\"%s\" (line=%d)\n",
+				progname, e->e_dn, lineno );
+			rc = EXIT_FAILURE;
+			entry_free( e );
+			if( continuemode ) continue;
+			break;
+		}
 
+		if( !noschemacheck ) {
 			/* check schema */
 			if ( schema_check_entry( e ) != 0 ) {
 				fprintf( stderr, "%s: schema violation in entry dn=\"%s\" (line=%d)\n",