Merge pull request #168 from coryb/testing

fix broken error handling
Merge branch 'testing' of github.com:Netflix/aminator into testing