diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c
index 5b39e21707..f7de88b694 100644
--- a/servers/slapd/extended.c
+++ b/servers/slapd/extended.c
@@ -157,16 +157,13 @@ do_extended(
 		goto done;
 	}
 
-	if( !(ext = find_extop(supp_ext_list, &reqoid))
 #ifdef LDAP_SLAPI
-		&& !(funcAddr)
+	getPluginFunc( &reqoid, &funcAddr ); /* NS-SLAPI extended operation */
+	if( !funcAddr && !(ext = find_extop(supp_ext_list, &reqoid )))
+#else
+	if( !(ext = find_extop(supp_ext_list, &reqoid )))
 #endif
-	) {
-#ifdef LDAP_SLAPI
-		/* Netscape extended operation */
-		getPluginFunc( &reqoid, &funcAddr );
-#endif
-
+	{
 #ifdef NEW_LOGGING
 		LDAP_LOG( OPERATION, ERR, 
 			"do_extended: conn %d  unsupported operation \"%s\"\n",