Yes, it makes sense to change it so that all errors go through the same path. I'll update it soon.