Updates for custom error logic