Returning better error message.
Merge pull request #267 from jaredbischof/master

Returning better error message.