fix up error handling

[#55348084] routes user (req, res, next) so we can call next(err), and
we call 'return next(err)' instead of 'next (err)' to shortcut further
processing in the route