More detailed error message on unexpected message type

This error throws from time to time in our specs. We suspect it's a race condition, but it'd be nice to have some more detail in the message when it fires.
Merge pull request #414 from bluepojo/patch-1

More detailed error message on unexpected message type