Also, there's a failing spec that's testing the message being raised, that needs to be updated.