Simplify

No need to check if currentMessages/currentPromise is null every time