Finish integrating custom errors