Fixed try/catches