Refactoring

try/catch is removed