Simpler error reporting

Don't adjust invalid errors more than setting `err.code = 'EINVALID'`

cc @willwhite