Routing most errors through `error()` so a custom error handler can take over
Merge pull request #84 from avoidwork/edge

Minor changes