re-add 404 handling