Avoid throwing an exception to handle validation errors
Merge pull request #1 from tadfisher/master

Avoid throwing an exception to handle validation errors