Need to fix second try/catch