This should prevent the crash in #8109 by stopping an invalid message from getting in the queue. There is still a problem farther up from here in that an invalid message shouldn't get this far - hopefully this will help track it down by providing a message at the time the issue happens instead of crashing later. Fixes #8109.