Adding some try/catch