updating to fix some try/catch mistakes