Update gems
Fix error handling to catch up with api change