diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 2ffa3767b0dc0fa1b013048a0f4c1f0d0eb387d6..b6399a9d7a22f5b7a0a251e5cb51c3d478ba2af0 100644
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -355,9 +355,8 @@ do_modify(
 	 * Calling slapi_x_modifications2ldapmods() destroyed modlist so
 	 * we don't need to free it.
 	 */
-	if ( rs->sr_err == 0 ) {
-		slapi_pblock_get( pb, SLAPI_MODIFY_MODS, (void **)&modv );
-		modlist = slapi_x_ldapmods2modifications( modv );
+	slapi_pblock_get( pb, SLAPI_MODIFY_MODS, (void **)&modv );
+	modlist = slapi_x_ldapmods2modifications( modv );
 
 	/*
 	 * NB: it is valid for the plugin to return no modifications
@@ -367,11 +366,10 @@ do_modify(
 	 * then slapi_x_ldapmods2modifications() above will return
 	 * NULL).
 	 */
-		if ( modlist == NULL ) {
-			rs->sr_err = LDAP_SUCCESS;
-			send_ldap_result( op, rs );
-			goto cleanup;
-		}
+	if ( modlist == NULL ) {
+		rs->sr_err = LDAP_SUCCESS;
+		send_ldap_result( op, rs );
+		goto cleanup;
 	}
 #endif /* defined( LDAP_SLAPI ) */