Undo the refactoring that swallows the error

https://github.com/mozilla-services/heka/commit/3361dd99abfe886259095009d59f256bc79fac95#diff-2bb4eb5d697fe3a655462d1c684a0346L151