Can you change this to return a proper 404 status code?