add rescue to update entries method, refactor out object build steps