Remove try-catch