Added try/catch
Changes from the laptop