Removed race conditions causing deadlock from messaging.