Branch out on error
Merge pull request #7 from zendesk/pelletier/204

Branch out on error