Fix 4041 errors to return http status 200