[WIP] Fixes #12: clear out promises that failed