Cleanup: minor coding style nit
What's the point of passing unnecessary data?
Identify 404 errors as such
Cleanup: use a more sensible name