Return 404 instead of undefined