Added try-catch(es)