readd rescues to make tests pass