Fixed a race conditions when deleting messengers.

Signed-off-by: JP-Ellis <coujellis@gmail.com>