Fix the endpoint error handling. Better stat names.