Added a few try-catches