A couple of tiny changes to handle 404 conditions