Add exception catches