Fixed try/catch