Add code to deal with exceptions