Cleaned up Try/catch blocks for easier reading