Throw error directly if it is the only thing passed in as the message
Merge pull request #117 from ryanwilliamquinn/master

Throw error directly if it is the only thing passed in as the message