Update to handle requests to objects that don't exist