Fixed missing try/catches