Add fix for no object found.