Completed transition to new error returns