[#1573] Fix NPE which could be triggered one failed promises that trigger a close89
Merge remote-tracking branch upstream/$:{upbranch}