Updates to error support