Fix review comments
Change to use next-error

Not entirely sure the binding for next-error is in the correct place.