Update to use new Error type

@garyb Resolves #2