Fixes #3723 : do the update of promises only in the failsafe