Changed try-catch strategy