Remove TBD note, add custom error