utilize try for better readability
Merge branch 'master' into updated_gems
fix missed deprecation thingys