Wrap errors, so we can compare against actual error types

Wrap errors, so we can compare against actual error types #56