Updated error handling mechanics to be more consistent