Once this is committed we can start the process of renaming errors2 as errors. I thought that combinig this into one commit would be more difficult to review.