Better error representation

Yes, the bug we saw was cause by the missing `return` before calling `next`.