Fixes #16432

Introducing during null check refeactoring. Before the promise was set to null inside the promise. I added a rejection because the promise value should never be used before that point, but it seems that introduced a regression.

Fix is to use `p` inside of the promise instead.