Remove try-catch, add spaces