- Changed exception catches to prevent errors being logged