Reverting some changes to custom errors