A small changes to how errors are handled